[PWGCF] zdcQVectors: Change procedure for getting shift correction from CCDB … (#13123)

Co-authored-by: ALICE Action Bot <alibuild@cern.ch>

Author: cnkoster

PWGCF/Flow/TableProducer/zdcQVectors.cxx

@@ -191,7 +191,6 @@ struct ZdcQVectors {
 
     TProfile3D* shiftprofileC = nullptr;
     TProfile3D* shiftprofileA = nullptr;
-
     bool isShiftProfileFound = false;
 
   } cal;
@@ -640,6 +639,10 @@ struct ZdcQVectors {
 
       cal.calibfilesLoaded[2] = false;
       cal.calibList[2] = nullptr;
+
+      cal.isShiftProfileFound = false;
+      cal.shiftprofileC = nullptr;
+      cal.shiftprofileA = nullptr;
     }
 
     const auto& zdcCol = foundBC.zdc();
@@ -922,19 +925,17 @@ struct ZdcQVectors {
       double deltaPsiZDCA = 0;
       double deltaPsiZDCC = 0;
 
-      if (!cfgCCDBdir_Shift.value.empty()) {
-        if (lastRunNumber != runnumber) {
+      if (!cfgCCDBdir_Shift.value.empty() && cal.isShiftProfileFound == false) {
+        LOGF(info, "Getting shift profile from CCDB for runnumber: %d", runnumber);
+        TList* hcorrList = ccdb->getForTimeStamp<TList>(cfgCCDBdir_Shift.value, foundBC.timestamp());
+        cal.shiftprofileC = reinterpret_cast<TProfile3D*>(hcorrList->FindObject("ShiftZDCC"));
+        cal.shiftprofileA = reinterpret_cast<TProfile3D*>(hcorrList->FindObject("ShiftZDCA"));
+        if (!cal.shiftprofileC || !cal.shiftprofileA) {
+          LOGF(error, "Shift profile not found in CCDB for runnumber: %d", runnumber);
           cal.isShiftProfileFound = false;
-          LOGF(info, "Getting shift profile from CCDB for runnumber: %d", runnumber);
-          TList* hcorrList = ccdb->getForTimeStamp<TList>(cfgCCDBdir_Shift.value, foundBC.timestamp());
-          cal.shiftprofileC = reinterpret_cast<TProfile3D*>(hcorrList->FindObject("ShiftZDCC"));
-          cal.shiftprofileA = reinterpret_cast<TProfile3D*>(hcorrList->FindObject("ShiftZDCA"));
-          if (!cal.shiftprofileC || !cal.shiftprofileA) {
-            LOGF(error, "Shift profile not found in CCDB for runnumber: %d", runnumber);
-          } else {
-            LOGF(error, "Shift profile found in CCDB for runnumber: %d", runnumber);
-            cal.isShiftProfileFound = true;
-          }
+        } else {
+          LOGF(info, "Shift profile found in CCDB for runnumber: %d", runnumber);
+          cal.isShiftProfileFound = true;
         }
       }
 
@@ -950,8 +951,8 @@ struct ZdcQVectors {
       float coeffshiftxZDCA = 0.0;
       float coeffshiftyZDCA = 0.0;
 
-      for (int ishift = 1; ishift <= nshift; ishift++) {
-        if (cal.isShiftProfileFound) {
+      if (cal.isShiftProfileFound) {
+        for (int ishift = 1; ishift <= nshift; ishift++) {
           int binshiftxZDCC = cal.shiftprofileC->FindBin(centrality, 0.5, ishift - 0.5); // bin 0.5
           int binshiftyZDCC = cal.shiftprofileC->FindBin(centrality, 1.5, ishift - 0.5);
           int binshiftxZDCA = cal.shiftprofileA->FindBin(centrality, 0.5, ishift - 0.5);
@@ -965,9 +966,10 @@ struct ZdcQVectors {
             coeffshiftxZDCA = cal.shiftprofileA->GetBinContent(binshiftxZDCA);
           if (binshiftyZDCA > 0)
             coeffshiftyZDCA = cal.shiftprofileA->GetBinContent(binshiftyZDCA);
+
+          deltaPsiZDCC += ((2 / (1.0 * ishift)) * (-1.0 * coeffshiftxZDCC * std::cos(ishift * 1.0 * psiZDCC) + coeffshiftyZDCC * std::sin(ishift * 1.0 * psiZDCC)));
+          deltaPsiZDCA += ((2 / (1.0 * ishift)) * (-1.0 * coeffshiftxZDCA * std::cos(ishift * 1.0 * psiZDCA) + coeffshiftyZDCA * std::sin(ishift * 1.0 * psiZDCA)));
         }
-        deltaPsiZDCC += ((2 / (1.0 * ishift)) * (-1.0 * coeffshiftxZDCC * std::cos(ishift * 1.0 * psiZDCC) + coeffshiftyZDCC * std::sin(ishift * 1.0 * psiZDCC)));
-        deltaPsiZDCA += ((2 / (1.0 * ishift)) * (-1.0 * coeffshiftxZDCA * std::cos(ishift * 1.0 * psiZDCA) + coeffshiftyZDCA * std::sin(ishift * 1.0 * psiZDCA)));
       }
 
       psiZDCCshift += deltaPsiZDCC;