[EMCAL-565, EMCAL-566] Fix CCDB access for calibrators

mfasDa · shahor02 · commit 109982096ec9 · 2022-10-04T10:01:10.000+02:00
- Trigger loading scalefactors for bad channel calib in
  run function
- Display calib params in finalizeCCDB
- Move configuration of the calibrators based on
  calibParams from init to dedicated configure function
diff --git a/Detectors/EMCAL/calibration/testWorkflow/EMCALChannelCalibratorSpec.h b/Detectors/EMCAL/calibration/testWorkflow/EMCALChannelCalibratorSpec.h
@@ -63,22 +63,13 @@ class EMCALChannelCalibDevice : public o2::framework::Task
         mTimeCalibrator = std::make_unique<o2::emcal::EMCALChannelCalibrator<o2::emcal::EMCALTimeCalibData, o2::emcal::TimeCalibrationParams>>();
       }
       mTimeCalibrator->SetCalibExtractor(mCalibExtractor);
-      mTimeCalibrator->setSlotLength(EMCALCalibParams::Instance().slotLength_tc);
-      if (EMCALCalibParams::Instance().UpdateAtEndOfRunOnly_tc) {
-        mBadChannelCalibrator->setUpdateAtTheEndOfRunOnly();
-      }
 
     } else { // bad cell calibration
       isBadChannelCalib = true;
       if (!mBadChannelCalibrator) {
         mBadChannelCalibrator = std::make_unique<o2::emcal::EMCALChannelCalibrator<o2::emcal::EMCALChannelData, o2::emcal::BadChannelMap>>();
       }
       mBadChannelCalibrator->SetCalibExtractor(mCalibExtractor);
-      mBadChannelCalibrator->setSlotLength(EMCALCalibParams::Instance().slotLength_bc);
-      if (EMCALCalibParams::Instance().UpdateAtEndOfRunOnly_bc) {
-        mBadChannelCalibrator->setUpdateAtTheEndOfRunOnly();
-      }
-      mBadChannelCalibrator->setIsTest(EMCALCalibParams::Instance().enableTestMode_bc);
     }
   }
 
@@ -89,11 +80,14 @@ class EMCALChannelCalibDevice : public o2::framework::Task
     // check if calib params need to be updated
     if (matcher == ConcreteDataMatcher("EMC", "EMCALCALIBPARAM", 0)) {
       LOG(info) << "EMCal CalibParams updated";
+      EMCALCalibParams::Instance().printKeyValues(true, true);
       return;
     }
     if (matcher == ConcreteDataMatcher("EMC", "SCALEFACTORS", 0)) {
       if (mBadChannelCalibrator && EMCALCalibParams::Instance().useScaledHisto_bc) {
+        LOG(info) << "Configuring scale factors for bad channel map";
         mBadChannelCalibrator->getCalibExtractor()->setBCMScaleFactors(reinterpret_cast<o2::emcal::EMCALChannelScaleFactors*>(obj));
+        mScaleFactorsInitialized = true;
       }
     }
   }
@@ -113,10 +107,21 @@ class EMCALChannelCalibDevice : public o2::framework::Task
     }
 
     if (mLoadCalibParamsFromCCDB) {
-      // for reading the calib objects from the ccdb
+      // for reading the calib objects from the CCDB
       pc.inputs().get<o2::emcal::EMCALCalibParams*>("EMC_CalibParam");
     }
 
+    if (mBadChannelCalibrator && EMCALCalibParams::Instance().useScaledHisto_bc && !mScaleFactorsInitialized) {
+      // Trigger reading the scale factors from the CCDB (Bad channel calib only)
+      pc.inputs().get<o2::emcal::EMCALChannelScaleFactors*>("EMC_Scalefactors");
+    }
+
+    if (!mIsConfigured) {
+      // configure calibrators (after calib params are loaded from the CCDB)
+      configureCalibrators();
+      mIsConfigured = true;
+    }
+
     auto tfcounter = o2::header::get<o2::framework::DataProcessingHeader*>(pc.inputs().get(getCellBinding()).header)->startTime;
 
     auto data = pc.inputs().get<gsl::span<o2::emcal::Cell>>(getCellBinding());
@@ -171,13 +176,15 @@ class EMCALChannelCalibDevice : public o2::framework::Task
   static const char* getCellTriggerRecordBinding() { return "EMCCellsTrgR"; }
 
  private:
-  std::unique_ptr<o2::emcal::EMCALChannelCalibrator<o2::emcal::EMCALChannelData, o2::emcal::BadChannelMap>> mBadChannelCalibrator;
-  std::unique_ptr<o2::emcal::EMCALChannelCalibrator<o2::emcal::EMCALTimeCalibData, o2::emcal::TimeCalibrationParams>> mTimeCalibrator;
-  std::shared_ptr<o2::emcal::EMCALCalibExtractor> mCalibExtractor;
-  std::shared_ptr<o2::base::GRPGeomRequest> mCCDBRequest;
-  std::string mCalibType;
-  bool isBadChannelCalib = true;
-  bool mLoadCalibParamsFromCCDB = true;
+  std::unique_ptr<o2::emcal::EMCALChannelCalibrator<o2::emcal::EMCALChannelData, o2::emcal::BadChannelMap>> mBadChannelCalibrator;     ///< Bad channel calibrator
+  std::unique_ptr<o2::emcal::EMCALChannelCalibrator<o2::emcal::EMCALTimeCalibData, o2::emcal::TimeCalibrationParams>> mTimeCalibrator; ///< Time calibrator
+  std::shared_ptr<o2::emcal::EMCALCalibExtractor> mCalibExtractor;                                                                     ///< Calibration postprocessing
+  std::shared_ptr<o2::base::GRPGeomRequest> mCCDBRequest;                                                                              ///< CCDB request for geometry
+  std::string mCalibType;                                                                                                              ///< Name of the calibration type
+  bool mIsConfigured = false;                                                                                                          ///< Configure status of calibrators
+  bool mScaleFactorsInitialized = false;                                                                                               ///< Scale factor init status
+  bool isBadChannelCalib = true;                                                                                                       ///< Calibration mode bad channel calib (false := time calib)
+  bool mLoadCalibParamsFromCCDB = true;                                                                                                ///< Switch for loading calib params from the CCDB
   std::array<double, 2> timeMeas;
 
   //________________________________________________________________
@@ -223,6 +230,26 @@ class EMCALChannelCalibDevice : public o2::framework::Task
       }
     }
   }
+
+  /// \brief Configure calibrators from the calib params
+  void configureCalibrators()
+  {
+    if (mTimeCalibrator) {
+      LOG(info) << "Configuring time calibrator";
+      mTimeCalibrator->setSlotLength(EMCALCalibParams::Instance().slotLength_tc);
+      if (EMCALCalibParams::Instance().UpdateAtEndOfRunOnly_tc) {
+        mBadChannelCalibrator->setUpdateAtTheEndOfRunOnly();
+      }
+    }
+    if (mBadChannelCalibrator) {
+      LOG(info) << "Configuring bad channel calibrator";
+      mBadChannelCalibrator->setSlotLength(EMCALCalibParams::Instance().slotLength_bc);
+      if (EMCALCalibParams::Instance().UpdateAtEndOfRunOnly_bc) {
+        mBadChannelCalibrator->setUpdateAtTheEndOfRunOnly();
+      }
+      mBadChannelCalibrator->setIsTest(EMCALCalibParams::Instance().enableTestMode_bc);
+    }
+  }
 };
 
 } // namespace calibration
