Merge branch 'AliceO2Group:dev' into new-detector4

Author: pkurash

Common/SimConfig/include/SimConfig/SimConfig.h

@@ -37,7 +37,8 @@ enum class SimFieldMode {
 enum class VertexMode {
   kNoVertex = 0,     // no vertexing should be applied in the generator
   kDiamondParam = 1, // Diamond param will influence vertexing
-  kCCDB = 2          // vertex should be taken from CCDB (Calib/MeanVertex object)
+  kCCDB = 2,         // vertex should be taken from CCDB (Calib/MeanVertex object)
+  kCollCxt = 3       // vertex should be taken from collision context
 };
 
 enum class TimeStampMode {

Common/SimConfig/src/SimConfig.cxx

@@ -394,8 +394,11 @@ bool SimConfig::parseVertexModeString(std::string const& vertexstring, VertexMod
   } else if (vertexstring == "kCCDB") {
     mode = VertexMode::kCCDB;
     return true;
+  } else if (vertexstring == "kCollContext") {
+    mode = VertexMode::kCollCxt;
+    return true;
   }
-  LOG(error) << "Vertex mode must be one of kNoVertex, kDiamondParam, kCCDB";
+  LOG(error) << "Vertex mode must be one of kNoVertex, kDiamondParam, kCCDB, kCollContext";
   return false;
 }
 

DataFormats/Detectors/TPC/include/DataFormatsTPC/CalibdEdxCorrection.h

@@ -91,8 +91,8 @@ class CalibdEdxCorrection
 
   void clear();
 
-  void writeToFile(std::string_view fileName, std::string_view objName = "CalibdEdxCorrection") const;
-  void loadFromFile(std::string_view fileName, std::string_view objName = "CalibdEdxCorrection");
+  void writeToFile(std::string_view fileName, std::string_view objName = "ccdb_object") const;
+  void loadFromFile(std::string_view fileName, std::string_view objName = "ccdb_object");
 
   /// \param outFileName name of the output file
   void dumpToTree(const char* outFileName = "calib_dedx.root") const;

DataFormats/Detectors/TPC/src/CalibdEdxCorrection.cxx

@@ -15,6 +15,7 @@
 #include <string_view>
 
 // o2 includes
+#include "Framework/Logger.h"
 #include "DataFormatsTPC/Defs.h"
 #include "CommonUtils/TreeStreamRedirector.h"
 
@@ -39,15 +40,27 @@ void CalibdEdxCorrection::clear()
 void CalibdEdxCorrection::writeToFile(std::string_view fileName, std::string_view objName) const
 {
   std::unique_ptr<TFile> file(TFile::Open(fileName.data(), "recreate"));
+  if (!file) {
+    LOGP(error, "Failed to open file {} for writing", fileName.data());
+    return;
+  }
+
   file->WriteObject(this, objName.data());
 }
 
 void CalibdEdxCorrection::loadFromFile(std::string_view fileName, std::string_view objName)
 {
   std::unique_ptr<TFile> file(TFile::Open(fileName.data()));
+  if (!file || file->IsZombie()) {
+    LOGP(error, "Failed to open file {}", fileName.data());
+    return;
+  }
+
   auto tmp = file->Get<CalibdEdxCorrection>(objName.data());
   if (tmp != nullptr) {
     *this = *tmp;
+  } else {
+    LOGP(error, "Failed to load object with name {} from file {}", objName.data(), fileName.data());
   }
 }
 

Detectors/GLOQC/src/MatchITSTPCQC.cxx

@@ -386,11 +386,11 @@ bool MatchITSTPCQC::init()
       mPhiPhysPrimDen[i]->Sumw2();
       mFractionITSTPCmatchPhysPrim[i] = new TEfficiency(Form("mFractionITSTPCmatchPhysPrim_%s", title[i].c_str()), Form("Fraction of ITSTPC matched tracks vs Pt (physical primary), wrt %s tracks %s; Pt [GeV/c]; Eff", title[i].c_str(), etaSel[i].c_str()), nbinsPt, xbinsPt);
 
-      m1OverPtPhysPrimNum[i] = new TH1D(Form("m1OverPtPhysPrimNum_%s", title[i].c_str()), Form("1/Pt distribution of matched tracks (physical primary), wrt %s tracks %s; 1/Pt [c/GeV]; dNd1/Pt", title[i].c_str(), etaSel[i].c_str()), 2 * mPtBins, -1. / mPtCut, 1. / mPtCut);
+      m1OverPtPhysPrimNum[i] = new TH1D(Form("m1OverPtPhysPrimNum_%s", title[i].c_str()), Form("1/Pt distribution of matched tracks (physical primary), wrt %s tracks %s; 1/Pt [c/GeV]; dNd1/Pt", title[i].c_str(), etaSel[i].c_str()), 2 * mPtBins, -20., 20.);
       m1OverPtPhysPrimNum[i]->Sumw2();
-      m1OverPtPhysPrimDen[i] = new TH1D(Form("m1OverPtPhysPrimDen_%s", title[i].c_str()), Form("1/PtPt distribution of %s tracks (physical primary) %s; 1/Pt [c/GeV]; dNd1/Pt", title[i].c_str(), etaSel[i].c_str()), 2 * mPtBins, -1. / mPtCut, 1. / mPtCut);
+      m1OverPtPhysPrimDen[i] = new TH1D(Form("m1OverPtPhysPrimDen_%s", title[i].c_str()), Form("1/PtPt distribution of %s tracks (physical primary) %s; 1/Pt [c/GeV]; dNd1/Pt", title[i].c_str(), etaSel[i].c_str()), 2 * mPtBins, -20., 20.);
       m1OverPtPhysPrimDen[i]->Sumw2();
-      mFractionITSTPCmatchPhysPrim1OverPt[i] = new TEfficiency(Form("mFractionITSTPCmatchPhysPrim1OverPt_%s", title[i].c_str()), Form("Fraction of ITSTPC matched tracks vs 1/Pt (physical primary), wrt %s tracks %s; 1/Pt [c/GeV]; Eff", title[i].c_str(), etaSel[i].c_str()), 2 * mPtBins, -1. / mPtCut, 1. / mPtCut);
+      mFractionITSTPCmatchPhysPrim1OverPt[i] = new TEfficiency(Form("mFractionITSTPCmatchPhysPrim1OverPt_%s", title[i].c_str()), Form("Fraction of ITSTPC matched tracks vs 1/Pt (physical primary), wrt %s tracks %s; 1/Pt [c/GeV]; Eff", title[i].c_str(), etaSel[i].c_str()), 2 * mPtBins, -20., 20.);
     }
   }
 

Detectors/GlobalTracking/include/GlobalTracking/MatchGlobalFwd.h

@@ -339,6 +339,7 @@ class MatchGlobalFwd
   o2::itsmft::ChipMappingMFT mMFTMapping;
   bool mMCTruthON = false;      ///< Flag availability of MC truth
   bool mUseMIDMCHMatch = false; ///< Flag for using MCHMID matches (TrackMCHMID)
+  bool mUseTrackTime = false;   ///< Flag for using the MCH or MCHMID track time information to select the MFT ROF(s)
   int mSaveMode = 0;            ///< Output mode [0 = SaveBestMatch; 1 = SaveAllMatches; 2 = SaveTrainingData; 3 = SaveNCandidates]
   int mNCandidates = 5;         ///< Numbers of matching candidates to save in savemode=3
   MatchingType mMatchingType = MATCHINGUNDEFINED;

Detectors/GlobalTracking/include/GlobalTracking/MatchGlobalFwdParam.h

@@ -39,6 +39,7 @@ struct GlobalFwdMatchingParam : public o2::conf::ConfigurableParamHelper<GlobalF
   bool MCMatching = false;                                ///< MFT-MCH matching computed from MCLabels
   double matchPlaneZ = -77.5;                             ///< MFT-MCH matching plane z coordinate
   bool useMIDMatch = false;                               ///< Use input from MCH-MID matching
+  bool useTrackTime = false;                              ///< Use the MCH or MCHMID track time information to select the MFT ROF(s)
   Int_t saveMode = kBestMatch;                            ///< Global Forward Tracks save mode
   float MFTRadLength = 0.042;                             ///< MFT thickness in radiation length
   float alignResidual = 1.;                               ///< Alignment residual for cluster position uncertainty

Detectors/GlobalTracking/src/MatchGlobalFwd.cxx

@@ -65,6 +65,9 @@ void MatchGlobalFwd::init()
   mUseMIDMCHMatch = matchingParam.useMIDMatch;
   LOG(info) << "UseMIDMCH Matching = " << (mUseMIDMCHMatch ? "true" : "false");
 
+  mUseTrackTime = matchingParam.useTrackTime;
+  LOG(info) << "Use track time = " << (mUseTrackTime ? "true" : "false");
+
   mSaveMode = matchingParam.saveMode;
   LOG(info) << "Save mode MFTMCH candidates = " << mSaveMode;
 
@@ -216,8 +219,8 @@ bool MatchGlobalFwd::processMCHMIDMatches()
       LOG(debug) << " MCHId: " << MCHId << " --> mMCHID2Work[MCHId]:" << mMCHID2Work[MCHId];
       const auto& IR = MIDMatch.getIR();
       int nBC = IR.differenceInBC(mStartIR);
-      float tMin = nBC * o2::constants::lhc::LHCBunchSpacingMUS;
-      float tMax = (nBC + 1) * o2::constants::lhc::LHCBunchSpacingMUS;
+      float tMin = (nBC - 1) * o2::constants::lhc::LHCBunchSpacingMUS;
+      float tMax = (nBC + 2) * o2::constants::lhc::LHCBunchSpacingMUS;
       thisMuonTrack.setMIDTrackID(MIDId);
       thisMuonTrack.setTimeMUS(MIDMatch.getTimeMUS(mStartIR).first);
       thisMuonTrack.tBracket.set(tMin, tMax);
@@ -435,6 +438,7 @@ void MatchGlobalFwd::ROFMatch(int MFTROFId, int firstMCHROFId, int lastMCHROFId)
 {
   /// Matches MFT tracks on a given ROF with MCH tracks in a range of ROFs
   const auto& thisMFTROF = mMFTTrackROFRec[MFTROFId];
+  const auto& thisMFTBracket = mMFTROFTimes[MFTROFId];
   const auto& firstMCHROF = mMCHTrackROFRec[firstMCHROFId];
   const auto& lastMCHROF = mMCHTrackROFRec[lastMCHROFId];
   int nFakes = 0, nTrue = 0;
@@ -464,6 +468,12 @@ void MatchGlobalFwd::ROFMatch(int MFTROFId, int firstMCHROFId, int lastMCHROFId)
   // loop over all MCH tracks
   for (auto MCHId = firstMCHTrackID; MCHId <= lastMCHTrackID; MCHId++) {
     auto& thisMCHTrack = mMCHWork[MCHId];
+
+    // If enabled, use the muon track time to check if the track is correlated with the MFT ROF
+    if (mUseTrackTime && (thisMFTBracket.isOutside(thisMCHTrack.tBracket))) {
+      continue;
+    }
+
     o2::MCCompLabel matchLabel;
     for (auto MFTId = firstMFTTrackID; MFTId <= lastMFTTrackID; MFTId++) {
       auto& thisMFTTrack = mMFTWork[MFTId];

Detectors/GlobalTrackingWorkflow/study/src/SVStudy.cxx

@@ -194,6 +194,8 @@ void SVStudySpec::updateTimeDependentParams(ProcessingContext& pc)
       // for occupancy estimator
       mParam = o2::gpu::GPUO2InterfaceUtils::getFullParamShared(0.f, mNHBPerTF);
     }
+    auto& elParam = o2::tpc::ParameterElectronics::Instance();
+    mTPCTBinMUSInv = 1. / elParam.ZbinWidth; // 1./TPC bin in microseconds
   }
   mBz = o2::base::Propagator::Instance()->getNominalBz();
   mFitterV0.setBz(mBz);
@@ -353,8 +355,8 @@ void SVStudySpec::process(o2::globaltracking::RecoContainer& recoData)
                  << "pv=" << pv
                  << "\n";
     }
-    tfID++;
   }
+  tfID++;
 }
 
 bool SVStudySpec::refitV0(const V0ID& id, o2::dataformats::V0& v0, o2::globaltracking::RecoContainer& recoData)

Detectors/MUON/MCH/Status/CMakeLists.txt

@@ -47,6 +47,7 @@ o2_add_executable(
     O2::DataFormatsMCH
     O2::Framework
     O2::MCHGlobalMapping
+    O2::MCHMappingImpl4
     O2::MCHStatus
     )