Add loadSCCorrMap option to loadCalibsFromCCDB, fetch the MC time gain calibration when

isMC is set, remove MC kinematics reader from dEdx calculation macro

Author: tubagundem

Detectors/TPC/calibration/include/TPCCalibration/CalculatedEdx.h

@@ -211,8 +211,9 @@ class CalculatedEdx
 
   /// load calibration objects from CCDB
   /// \param runNumberOrTimeStamp run number or time stamp
-  /// \param isMC set if dEdx space-charge corrections will be loaded for MC or real data
-  void loadCalibsFromCCDB(long runNumberOrTimeStamp, const bool isMC = false);
+  /// \param isMC set if dEdx residual and space-charge corrections will be loaded for MC or real data
+  /// \param loadSCCorrMap set to false to skip loading the space-charge correction maps
+  void loadCalibsFromCCDB(long runNumberOrTimeStamp, const bool isMC = false, const bool loadSCCorrMap = true);
 
   /// load calibration objects from local CCDB folder
   /// \param localCCDBFolder local CCDB folder

Detectors/TPC/calibration/macro/calculatedEdx.C

@@ -40,8 +40,6 @@
 #include "DataFormatsTPC/ClusterNative.h"
 #include "DataFormatsTPC/ClusterNativeHelper.h"
 #include "SimulationDataFormat/MCCompLabel.h"
-#include "SimulationDataFormat/MCTrack.h"
-#include "Steer/MCKinematicsReader.h"
 #include "TPCCalibration/CalculatedEdx.h"
 #endif
 
@@ -91,14 +89,13 @@ std::pair<std::unique_ptr<TFile>, std::unique_ptr<TTree>> openTreeOrNull(const s
 /// \param propagateParams propagate only the track parameters (fastest option, no material corrections); only used if useRefit and propagateTrack are both false
 /// \param debug enable the CalculatedEdx debug streamer, additionally writing one dEdxDebug_t<i>.root file with per-cluster information per worker thread
 /// \param nThreads number of worker threads used to process the tracks of one event in parallel
-/// \param isMC set to true for MC productions to read the true MC track (TPCTracksMCTruth branch + mcKineFileName) for each track into an additional "mctrack" branch
+/// \param isMC set to true for MC productions to read the true MC track label (TPCTracksMCTruth branch) for each track into an additional "mcLabel" branch
 /// \param isMatchedToITS set to true to also read o2trac_its.root/o2match_itstpc.root and restrict the dE/dx calculation to TPC tracks matched to an ITS track
 /// \param tfIDFileName name of the optional timeframe ID file; if found in dir, its per-entry time stamp is used for the CCDB instead of runNumberOrTimeStamp
 /// \param tpcTracksFileName name of the file with the TPC tracks
 /// \param clusterNativeFileName name of the file with the TPC native clusters
 /// \param itsTracksFileName name of the file with the ITS tracks; only used if isMatchedToITS is true
 /// \param matchFileName name of the file with the TPC-ITS match information; only used if isMatchedToITS is true
-/// \param mcKineFileName base name (without extension) of the MC kinematics file used to resolve MC track labels; only used if isMC is true
 void calculatedEdx(const std::string dir = ".",
                    const long runNumberOrTimeStamp = 0,
                    const std::string outFile = "dEdxCalc.root",
@@ -120,8 +117,7 @@ void calculatedEdx(const std::string dir = ".",
                    const std::string tpcTracksFileName = "tpctracks.root",
                    const std::string clusterNativeFileName = "tpc-native-clusters.root",
                    const std::string itsTracksFileName = "o2trac_its.root",
-                   const std::string matchFileName = "o2match_itstpc.root",
-                   const std::string mcKineFileName = "o2sim")
+                   const std::string matchFileName = "o2match_itstpc.root")
 {
   ROOT::EnableThreadSafety();
 
@@ -164,18 +160,12 @@ void calculatedEdx(const std::string dir = ".",
   tpcTree->SetBranchAddress("ClusRefs", &tpcTrackClIdxVecInput);
 
   std::vector<o2::MCCompLabel> tpcMCTruth, *tpcMCTruthPtr = &tpcMCTruth;
-  o2::steer::MCKinematicsReader mcReader;
   if (isMC) {
     if (!tpcTree->GetBranch("TPCTracksMCTruth")) {
       LOGP(error, "Branch 'TPCTracksMCTruth' not found in {}/{}, cannot resolve MC truth", dir, tpcTracksFileName);
       return;
     }
     tpcTree->SetBranchAddress("TPCTracksMCTruth", &tpcMCTruthPtr);
-    const auto kineFileName = fmt::format("{}/{}", dir, mcKineFileName);
-    if (!mcReader.initFromKinematics(kineFileName)) {
-      LOGP(error, "Could not initialize MCKinematicsReader from {}", kineFileName);
-      return;
-    }
   }
 
   std::unique_ptr<TFile> itsFile;
@@ -260,7 +250,8 @@ void calculatedEdx(const std::string dir = ".",
     for (auto& calcdEdx : calcdEdxPerThread) {
       calcdEdx.setMembers(tpcTrackClIdxVecInput, clusterIndex, &tpcTracks);
       if (localCCDBFolder.empty()) {
-        calcdEdx.loadCalibsFromCCDB(timeStamp, isMC);
+        const bool loadSCCorrMap = (correctionMask & CorrectionFlags::dEdxSC) == CorrectionFlags::dEdxSC;
+        calcdEdx.loadCalibsFromCCDB(timeStamp, isMC, loadSCCorrMap);
       } else {
         calcdEdx.loadCalibsFromLocalCCDBFolder(localCCDBFolder.data());
       }
@@ -338,11 +329,7 @@ void calculatedEdx(const std::string dir = ".",
         }
         if (isMC) {
           const auto& label = mcLabelOut[iThread][i];
-          const auto* mcTrack = label.isValid() ? mcReader.getTrack(label) : nullptr;
           row << "mcLabel=" << label;
-          if (mcTrack) {
-            row << "mctrack=" << *mcTrack;
-          }
         }
         row << "\n";
       }

Detectors/TPC/calibration/src/CalculatedEdx.cxx

@@ -645,7 +645,7 @@ bool CalculatedEdx::isInStackBoundaries(int stackNumber, unsigned char rowIndex,
   return false;
 }
 
-void CalculatedEdx::loadCalibsFromCCDB(long runNumberOrTimeStamp, const bool isMC)
+void CalculatedEdx::loadCalibsFromCCDB(long runNumberOrTimeStamp, const bool isMC, const bool loadSCCorrMap)
 {
   // setup CCDB manager
   auto& cm = o2::ccdb::BasicCCDBManager::instance();
@@ -675,7 +675,7 @@ void CalculatedEdx::loadCalibsFromCCDB(long runNumberOrTimeStamp, const bool isM
   mCalibCont.setGainMapResidual(gainMapResidual);
 
   // set the residual dEdx correction
-  o2::tpc::CalibdEdxCorrection* residualObj = cm.getForTimeStamp<o2::tpc::CalibdEdxCorrection>(o2::tpc::CDBTypeMap.at(o2::tpc::CDBType::CalTimeGain), tRun);
+  o2::tpc::CalibdEdxCorrection* residualObj = isMC ? cm.getForTimeStamp<o2::tpc::CalibdEdxCorrection>(o2::tpc::CDBTypeMap.at(o2::tpc::CDBType::CalTimeGainMC), tRun) : cm.getForTimeStamp<o2::tpc::CalibdEdxCorrection>(o2::tpc::CDBTypeMap.at(o2::tpc::CDBType::CalTimeGain), tRun);
 
   const auto* residualCorr = static_cast<o2::tpc::CalibdEdxCorrection*>(residualObj);
   mCalibCont.setResidualCorrection(*residualCorr);
@@ -696,14 +696,16 @@ void CalculatedEdx::loadCalibsFromCCDB(long runNumberOrTimeStamp, const bool isM
   const o2::base::MatLayerCylSet* matLut = o2::base::MatLayerCylSet::rectifyPtrFromFile(cm.get<o2::base::MatLayerCylSet>("GLO/Param/MatLUT"));
   propagator->setMatLUT(matLut);
 
-  // load sc correction maps
-  auto avgMap = isMC ? cm.getForTimeStamp<o2::gpu::TPCFastTransform>(o2::tpc::CDBTypeMap.at(o2::tpc::CDBType::CalCorrMapMC), tRun) : cm.getForTimeStamp<o2::gpu::TPCFastTransform>(o2::tpc::CDBTypeMap.at(o2::tpc::CDBType::CalCorrMap), tRun);
-  avgMap->rectifyAfterReadingFromFile();
+  // load sc correction maps; skip if not needed
+  if (loadSCCorrMap) {
+    auto avgMap = isMC ? cm.getForTimeStamp<o2::gpu::TPCFastTransform>(o2::tpc::CDBTypeMap.at(o2::tpc::CDBType::CalCorrMapMC), tRun) : cm.getForTimeStamp<o2::gpu::TPCFastTransform>(o2::tpc::CDBTypeMap.at(o2::tpc::CDBType::CalCorrMap), tRun);
+    avgMap->rectifyAfterReadingFromFile();
 
-  auto derMap = isMC ? cm.getForTimeStamp<o2::gpu::TPCFastTransform>(o2::tpc::CDBTypeMap.at(o2::tpc::CDBType::CalCorrDerivMapMC), tRun) : cm.getForTimeStamp<o2::gpu::TPCFastTransform>(o2::tpc::CDBTypeMap.at(o2::tpc::CDBType::CalCorrDerivMap), tRun);
-  derMap->rectifyAfterReadingFromFile();
+    auto derMap = isMC ? cm.getForTimeStamp<o2::gpu::TPCFastTransform>(o2::tpc::CDBTypeMap.at(o2::tpc::CDBType::CalCorrDerivMapMC), tRun) : cm.getForTimeStamp<o2::gpu::TPCFastTransform>(o2::tpc::CDBTypeMap.at(o2::tpc::CDBType::CalCorrDerivMap), tRun);
+    derMap->rectifyAfterReadingFromFile();
 
-  mSCdEdxCorrection.setCorrectionMaps(avgMap, derMap);
+    mSCdEdxCorrection.setCorrectionMaps(avgMap, derMap);
+  }
 
   // set the dead channel map
   o2::tpc::DeadChannelMapCreator deadCMCreator;