Add mult estimators to matching debug output (#13064)

Author: shahor02

Detectors/GlobalTracking/CMakeLists.txt

@@ -36,6 +36,7 @@ o2_add_library(GlobalTracking
                         O2::FT0Reconstruction
                         O2::TPCFastTransformation
                         O2::GPUO2Interface
+                        O2::GPUTracking
                         O2::TPCBase
                         O2::TPCReconstruction
                         O2::TPCCalibration

Detectors/GlobalTracking/include/GlobalTracking/MatchTPCITS.h

@@ -372,6 +372,8 @@ class MatchTPCITS
   ///< set Bunch filling and init helpers for validation by BCs
   void setBunchFilling(const o2::BunchFilling& bf);
 
+  void setNHBPerTF(int n) { mNHBPerTF = n; }
+
   ///< ITS readout mode
   void setITSTriggered(bool v) { mITSTriggered = v; }
   bool isITSTriggered() const { return mITSTriggered; }
@@ -563,6 +565,9 @@ class MatchTPCITS
   float mBz = 0;                        ///< nominal Bz
   int mTFCount = 0;                     ///< internal TF counter for debugger
   int mNThreads = 1;                    ///< number of OMP threads
+  int mNHBPerTF = 0;
+  int mNTPCOccBinLength = 0; ///< TPC occ. histo bin length in TBs
+  float mNTPCOccBinLengthInv;
   o2::InteractionRecord mStartIR{0, 0}; ///< IR corresponding to the start of the TF
 
   ///========== Parameters to be set externally, e.g. from CCDB ====================
@@ -668,7 +673,7 @@ class MatchTPCITS
   std::vector<o2::MCCompLabel> mTPCLblWork; ///< TPC track labels
   std::vector<o2::MCCompLabel> mITSLblWork; ///< ITS track labels
   std::vector<float> mWinnerChi2Refit; ///< vector of refitChi2 for winners
-
+  std::vector<float> mTBinClOcc;       ///< TPC occupancy histo: i-th entry is the integrated occupancy for ~1 orbit starting from the TB = i*mNTPCOccBinLength
   // ------------------------------
   std::vector<TPCABSeed> mTPCABSeeds; ///< pool of primary TPC seeds for AB
   ///< indices of selected track entries in mTPCWork (for tracks selected by AfterBurner)

Detectors/GlobalTracking/src/MatchTPCITS.cxx

@@ -45,6 +45,8 @@
 #include "ITStracking/IOUtils.h"
 
 #include "GPUO2Interface.h" // Needed for propper settings in GPUParam.h
+#include "GPUParam.h"
+#include "GPUParam.inc"
 #ifdef WITH_OPENMP
 #include <omp.h>
 #endif
@@ -575,6 +577,28 @@ bool MatchTPCITS::prepareTPCData()
   }
 */
   mTPCRefitter = std::make_unique<o2::gpu::GPUO2InterfaceRefit>(mTPCClusterIdxStruct, mTPCCorrMapsHelper, mBz, mTPCTrackClusIdx.data(), 0, mTPCRefitterShMap.data(), mTPCRefitterOccMap.data(), mTPCRefitterOccMap.size(), nullptr, o2::base::Propagator::Instance());
+  mNTPCOccBinLength = mTPCRefitter->getParam()->rec.tpc.occupancyMapTimeBins;
+  mTBinClOcc.clear();
+  if (mNTPCOccBinLength > 1 && mTPCRefitterOccMap.size()) {
+    mNTPCOccBinLengthInv = 1. / mNTPCOccBinLength;
+    int nTPCBins = mNHBPerTF * o2::constants::lhc::LHCMaxBunches / 8, ninteg = 0;
+    int nTPCOccBins = nTPCBins * mNTPCOccBinLengthInv, sumBins = std::max(1, int(o2::constants::lhc::LHCMaxBunches / 8 * mNTPCOccBinLengthInv));
+    mTBinClOcc.resize(nTPCOccBins);
+    float sm = 0., tb = (nTPCOccBins - 0.5) * mNTPCOccBinLength, mltPrev = 0.;
+    for (int i = nTPCOccBins; i--;) {
+      float mlt = mTPCRefitter->getParam()->GetUnscaledMult(tb);
+      sm += mlt;
+      mTBinClOcc.push_back(sm);
+      if (ninteg++ > mNTPCOccBinLength) {
+        sm -= mltPrev;
+      }
+      //      LOGP(info, "BIN {} of {} -> {} with inst val {} (prev = {}) BL={} nInt={} tb={}", i, nTPCOccBins, sm, mlt, mltPrev, mNTPCOccBinLength, ninteg, tb);
+      mltPrev = mlt;
+      tb -= mNTPCOccBinLength;
+    }
+  } else {
+    mTBinClOcc.resize(1);
+  }
   mInteractionMUSLUT.clear();
   mInteractionMUSLUT.resize(maxTime + 3 * o2::constants::lhc::LHCOrbitMUS, -1);
   mTimer[SWPrepTPC].Stop();
@@ -1478,6 +1502,8 @@ void MatchTPCITS::fillCalibDebug(int ifit, int iTPC, const o2::dataformats::Trac
         itsRefAltPID.setX(-10);
       }
     }
+    int tb = mTPCTracksArray[tTPC.sourceID].getTime0() * mNTPCOccBinLengthInv;
+    float mltTPC = tb < 0 ? mTBinClOcc[0] : (tb >= mTBinClOcc.size() ? mTBinClOcc.back() : mTBinClOcc[tb]);
     (*mDBGOut) << "refit"
                << "tpcOrig=" << mTPCTracksArray[tTPC.sourceID] << "itsOrig=" << mITSTracksArray[tITS.sourceID] << "itsRef=" << tITS << "tpcRef=" << tTPC << "matchRefit=" << match
                << "timeCorr=" << timeC << "dTimeFT0=" << minDiffFT0 << "dTimes=" << dtimes
@@ -1487,6 +1513,9 @@ void MatchTPCITS::fillCalibDebug(int ifit, int iTPC, const o2::dataformats::Trac
                  << "itsLbl=" << mITSLblWork[iITS] << "tpcLbl=" << mTPCLblWork[iTPC];
     }
     (*mDBGOut) << "refit"
+               << "multTPC=" << mltTPC
+               << "multITSTr=" << mITSTrackROFRec[tITS.roFrame]
+               << "multITSCl=" << mITSClusterROFRec[tITS.roFrame]
                << "tf=" << mTFCount << "\n";
   }
 #endif
@@ -2803,8 +2832,14 @@ void MatchTPCITS::fillTPCITSmatchTree(int itsID, int tpcID, int rejFlag, float c
     (*mDBGOut) << "match"
                << "itsLbl=" << mITSLblWork[itsID] << "tpcLbl=" << mTPCLblWork[tpcID];
   }
+  int tb = mTPCTracksArray[trackTPC.sourceID].getTime0() * mNTPCOccBinLengthInv;
+  float mltTPC = tb < 0 ? mTBinClOcc[0] : (tb >= mTBinClOcc.size() ? mTBinClOcc.back() : mTBinClOcc[tb]);
   (*mDBGOut) << "match"
-             << "rejFlag=" << rejFlag << "\n";
+             << "rejFlag=" << rejFlag
+             << "multTPC=" << tb
+             << "multITSTr=" << mITSTrackROFRec[trackITS.roFrame]
+             << "multITSCl=" << mITSClusterROFRec[trackITS.roFrame]
+             << "\n";
 
   mTimer[SWDBG].Stop();
 }
@@ -2833,7 +2868,12 @@ void MatchTPCITS::dumpWinnerMatches()
       (*mDBGOut) << "matchWin"
                  << "itsLbl=" << mITSLblWork[iits] << "tpcLbl=" << mTPCLblWork[itpc];
     }
+    int tb = mTPCTracksArray[tTPC.sourceID].getTime0() * mNTPCOccBinLengthInv;
+    float mltTPC = tb < 0 ? mTBinClOcc[0] : (tb >= mTBinClOcc.size() ? mTBinClOcc.back() : mTBinClOcc[tb]);
     (*mDBGOut) << "matchWin"
+               << "multTPC=" << mTPCRefitter->getParam()->GetUnscaledMult(mTPCTracksArray[tTPC.sourceID].getTime0())
+               << "multITSTr=" << mITSTrackROFRec[tITS.roFrame]
+               << "multITSCl=" << mITSClusterROFRec[tITS.roFrame]
                << "\n";
   }
   mTimer[SWDBG].Stop();

Detectors/GlobalTrackingWorkflow/src/TPCITSMatchingSpec.cxx

@@ -184,6 +184,7 @@ void TPCITSMatchingDPL::updateTimeDependentParams(ProcessingContext& pc)
     mMatching.setITSTimeBiasInBC(alpParams.roFrameBiasInBC);
     mMatching.setSkipTPCOnly(mSkipTPCOnly);
     mMatching.setITSTriggered(!o2::base::GRPGeomHelper::instance().getGRPECS()->isDetContinuousReadOut(o2::detectors::DetID::ITS));
+    mMatching.setNHBPerTF(o2::base::GRPGeomHelper::instance().getGRPECS()->getNHBFPerTF());
     mMatching.setMCTruthOn(mUseMC);
     mMatching.setUseFT0(mUseFT0);
     mMatching.setVDriftCalib(mCalibMode);

GPU/GPUTracking/Interface/GPUO2InterfaceRefit.h

@@ -80,6 +80,7 @@ class GPUO2InterfaceRefit
   void setTrackReferenceX(float v);
   void setIgnoreErrorsAtTrackEnds(bool v);
   void updateCalib(const o2::gpu::CorrectionMapsHelper* trans, float bzNominalGPU);
+  auto getParam() const { return mParam.get(); }
 
   // To create shared cluster maps and occupancy maps.
   // param is an optional parameter to override the param object, by default a default object from --configKeyValues is used.