conditional loading of maps + fetch time reso and toa maps

Author: maciacco

Detectors/Upgrades/ALICE3/IOTOF/simulation/include/IOTOFSimulation/Digitizer.h

@@ -75,11 +75,9 @@ class Digitizer : public TObject
   // Provide the common iotof::GeometryTGeo to access matrices and segmentation
   void setGeometry(const o2::iotof::GeometryTGeo* gm) { mGeometry = gm; }
 
-  void loadEfficiencyMap(const TH2D* map);
-
-  void loadResolutionMap(const TH2D* map);
-
-  void loadTimeOfArrivalMap(const TH2D* map);
+  void loadEfficiencyMap(TH2D* map) { mEfficiencyMap = map; }
+  void loadResolutionMap(TH2D* map) { mResolutionMap = map; }
+  void loadTimeOfArrivalMap(TH2D* map) { mTimeOfArrivalMap = map; }
 
   void prepareScaledResolutionMap();
 

Detectors/Upgrades/ALICE3/IOTOF/simulation/src/Digitizer.cxx

@@ -358,25 +358,6 @@ int Digitizer::energyToCharge(float energyLoss) const
 }
 
 //_______________________________________________________________________
-
-void Digitizer::loadEfficiencyMap(const TH2D* map)
-{
-  mEfficiencyMap = dynamic_cast<TH2D*>(map->Clone());
-  mEfficiencyMap->SetDirectory(nullptr);
-}
-
-void Digitizer::loadResolutionMap(const TH2D* map)
-{
-  mResolutionMap = dynamic_cast<TH2D*>(map->Clone());
-  mResolutionMap->SetDirectory(nullptr);
-}
-
-void Digitizer::loadTimeOfArrivalMap(const TH2D* map)
-{
-  mTimeOfArrivalMap = dynamic_cast<TH2D*>(map->Clone());
-  mTimeOfArrivalMap->SetDirectory(nullptr);
-}
-
 void Digitizer::prepareScaledResolutionMap()
 {
   if (!mResolutionMap) {

Steer/DigitizerWorkflow/src/IOTOFDigitizerSpec.cxx

@@ -73,6 +73,13 @@ class IOTOFDPLDigitizerTask : o2::base::BaseDPLDigitizer
     if (mFinished) {
       return;
     }
+
+    if (mEnableResponseFiles) {
+      pc.inputs().get<TH2D*>("madpixeff");
+      pc.inputs().get<TH2D*>("madpixreso");
+      pc.inputs().get<TH2D*>("madpixtoa");
+    }
+
     mFirstOrbitTF = pc.services().get<o2::framework::TimingInfo>().firstTForbit;
     const o2::InteractionRecord firstIR(0, mFirstOrbitTF);
 
@@ -169,20 +176,45 @@ class IOTOFDPLDigitizerTask : o2::base::BaseDPLDigitizer
 
   void finaliseCCDB(ConcreteDataMatcher& matcher, void* obj)
   {
-    if (!mEnableResponseFiles) {
-      return;
-    }
     if (matcher == ConcreteDataMatcher(mOrigin, "MADPIXEFF", 0)) {
       if (mLocalEfficiencyFile.empty()) {
         LOG(info) << "Using CCDB/MADPIX efficiency file";
-        mDigitizer.loadEfficiencyMap((const TH2D*)obj);
+        mDigitizer.loadEfficiencyMap((TH2D*)obj);
       } else {
         LOG(info) << "Response function will be loaded from local file: " << mLocalEfficiencyFile;
         std::unique_ptr<TFile> file(TFile::Open(mLocalEfficiencyFile.data(), "READ"));
         if (!file) {
           LOG(fatal) << "Cannot open response file " << mLocalEfficiencyFile.data();
         }
-        mDigitizer.loadEfficiencyMap((const TH2D*)file->Get("hEfficiencyMap"));
+        mDigitizer.loadEfficiencyMap((TH2D*)file->Get("hEfficiencyMap"));
+      }
+      return;
+    }
+    if (matcher == ConcreteDataMatcher(mOrigin, "MADPIXRESO", 0)) {
+      if (mLocalTimeResoFile.empty()) {
+        LOG(info) << "Using CCDB/MADPIX time resolution file";
+        mDigitizer.loadResolutionMap((TH2D*)obj);
+      } else {
+        LOG(info) << "Response function will be loaded from local file: " << mLocalTimeResoFile;
+        std::unique_ptr<TFile> file(TFile::Open(mLocalTimeResoFile.data(), "READ"));
+        if (!file) {
+          LOG(fatal) << "Cannot open response file " << mLocalTimeResoFile.data();
+        }
+        mDigitizer.loadResolutionMap((TH2D*)file->Get("hSigmaPixel"));
+      }
+      return;
+    }
+    if (matcher == ConcreteDataMatcher(mOrigin, "MADPIXTOA", 0)) {
+      if (mLocalToAFile.empty()) {
+        LOG(info) << "Using CCDB/MADPIX time-of-arrival file";
+        mDigitizer.loadTimeOfArrivalMap((TH2D*)obj);
+      } else {
+        LOG(info) << "Response function will be loaded from local file: " << mLocalToAFile;
+        std::unique_ptr<TFile> file(TFile::Open(mLocalToAFile.data(), "READ"));
+        if (!file) {
+          LOG(fatal) << "Cannot open response file " << mLocalToAFile.data();
+        }
+        mDigitizer.loadTimeOfArrivalMap((TH2D*)file->Get("toa_pixel"));
       }
     }
   }