Merge branch 'AliceO2Group:master' into master

Author: FDUEnrich

.clang-tidy

@@ -42,6 +42,7 @@ Checks:
   - google-default-arguments
   # - google-explicit-constructor # triggered for O2 columns
   - google-global-names-in-headers
+  - google-readability-casting # same as cpplint:readability/casting
   # - misc-const-correctness # to be checked
   - misc-header-include-cycle
   - misc-include-cleaner
@@ -111,8 +112,6 @@ WarningsAsErrors: >-
   *,
   -readability-braces-around-statements,
   -readability-suspicious-call-argument,
-  -modernize-*,
-  -readability-*,
   -bugprone-assignment-in-if-condition,
   -bugprone-branch-clone,
   -bugprone-copy-constructor-init,
@@ -140,17 +139,20 @@ WarningsAsErrors: >-
   -cppcoreguidelines-missing-std-forward,
   -cppcoreguidelines-prefer-member-initializer,
   -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
-  -cppcoreguidelines-pro-type-const-cast,
-  -cppcoreguidelines-pro-type-cstyle-cast,
   -cppcoreguidelines-pro-type-member-init,
-  -cppcoreguidelines-pro-type-reinterpret-cast,
-  -cppcoreguidelines-pro-type-static-cast-downcast,
   -cppcoreguidelines-pro-type-union-access,
   -cppcoreguidelines-slicing,
   -cppcoreguidelines-virtual-class-destructor,
+  -modernize-*,
+  -readability-*,
+  readability-redundant-casting,
 # Positives for the following checks are currently being fixed and should be reported as errors.
 # clang-analyzer-*
 # clang-diagnostic-*
+# cppcoreguidelines-pro-type-const-cast
+# cppcoreguidelines-pro-type-cstyle-cast
+# cppcoreguidelines-pro-type-reinterpret-cast
+# cppcoreguidelines-pro-type-static-cast-downcast
 # google-default-arguments
 # misc-include-cleaner
 # misc-redundant-expression

Common/Tools/TrackTuner.h

@@ -193,6 +193,8 @@ struct TrackTuner : o2::framework::ConfigurableGroup {
     LOG(info) << "[TrackTuner::getPathInputFileAutomaticFromCCDB]: +++                Run list: 559408 <= runNumber && runNumber <= 559456                                                                 +++";
     LOG(info) << "[TrackTuner::getPathInputFileAutomaticFromCCDB]: +++      [CASE 8]: pp, 13.6 TeV 2025, 2026, CCDB path Users/m/mfaggin/test/inputsTrackTuner/pp2026/pass1/vsPhi                          +++";
     LOG(info) << "[TrackTuner::getPathInputFileAutomaticFromCCDB]: +++                Run list: (563182 <= runNumber <= 567592 (2025)) || (569945 <= runNumber <= 571787 (2026))                           +++";
+    LOG(info) << "[TrackTuner::getPathInputFileAutomaticFromCCDB]: +++      [CASE 9]: p-O, 9.62 TeV 2025, CCDB path Users/m/mfaggin/test/inputsTrackTuner/pO                                               +++";
+    LOG(info) << "[TrackTuner::getPathInputFileAutomaticFromCCDB]: +++                Run list: 564250 <= runNumber <= 564297                                                                              +++";
     LOG(info) << "[TrackTuner::getPathInputFileAutomaticFromCCDB]: +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
     LOG(info) << "";
 
@@ -262,6 +264,14 @@ struct TrackTuner : o2::framework::ConfigurableGroup {
       pathInputFile = "Users/m/mfaggin/test/inputsTrackTuner/pp2026/pass1/vsPhi";
       LOG(info) << "[TrackTuner::getPathInputFileAutomaticFromCCDB]:   >>>   pp, 13.6 TeV 2025, 2026, CCDB path " << pathInputFile;
       LOG(info) << "                                                   >>>   Run list: (563182 <= runNumber <= 567592 (2025)) || (569945 <= runNumber <= 571787 (2026)) ";
+    } else if (564250 <= runNumber && runNumber <= 564297) {
+      ///
+      ///   [CASE 9]: p-O, 9.62 TeV 2025, CCDB path Users/m/mfaggin/test/inputsTrackTuner/pO
+      ///             Run list: 564250 <= runNumber <= 564297
+      ///
+      pathInputFile = "Users/m/mfaggin/test/inputsTrackTuner/pO";
+      LOG(info) << "[TrackTuner::getPathInputFileAutomaticFromCCDB]:   >>>   p-O, 9.62 TeV 2025, CCDB path " << pathInputFile;
+      LOG(info) << "                                                   >>>   Run list: 564250 <= runNumber <= 564297 ";
     } else {
       LOG(fatal) << "runNumber " << runNumber << " not supported for the autodetection. Please switch to manual configuration of the TrackTuner object. Aborting...";
     }

DPG/Tasks/AOTEvent/CMakeLists.txt

@@ -11,7 +11,7 @@
 
 o2physics_add_dpl_workflow(event-selection-qa
                            SOURCES eventSelectionQa.cxx
-                           PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::AnalysisCCDB O2::DetectorsBase O2::DataFormatsITSMFT
+                           PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::AnalysisCCDB O2::DetectorsBase O2::DataFormatsITSMFT O2::TPCBase
                            COMPONENT_NAME Analysis)
 
 o2physics_add_dpl_workflow(lumi-qa

DPG/Tasks/AOTEvent/eventSelectionQa.cxx

@@ -44,6 +44,7 @@
 #include <TMath.h>
 #include <TString.h>
 
+#include <TrackTools/TrackGeometry.h>
 #include <sys/types.h>
 
 #include <bitset>
@@ -73,6 +74,8 @@ struct EventSelectionQaTask {
   Configurable<bool> isLowFlux{"isLowFlux", 1, "1 - low flux (pp, pPb), 0 - high flux (PbPb)"};
   Configurable<bool> fillITSdeadStaveHists{"fillITSdeadStaveHists", 0, "0 - no, 1 - yes"};
   Configurable<bool> fillTPCnClsVsOccupancyHists{"fillTPCnClsVsOccupancyHists", 0, "0 - no, 1 - yes"};
+  Configurable<bool> useTestWithTrackTools{"useTestWithTrackTools", 0, "0 - no, 1 - yes"};                                           // experimental
+  Configurable<int> thresholdNrowsForTrackToolTest{"thresholdNrowsForTrackToolTest", 120, "threshold for Nrows for TrackTool test"}; // minimum number of TPC rows (experimental)
 
   Service<o2::ccdb::BasicCCDBManager> ccdb;
   HistogramRegistry histos{"Histos", {}, OutputObjHandlingPolicy::AnalysisObject};
@@ -91,6 +94,8 @@ struct EventSelectionQaTask {
   std::string strPassName = "";         // RecoPassName (for data) or AnchorPassName (for MC) from metadata
   bool isMC = false;
 
+  o2::tpc::recohelpers::TPCSectorEdgeConfig tpcSectorEdgeConfig; // for special selection of tracks within TPC
+
   std::bitset<nBCsPerOrbit> bcPatternA;
   std::bitset<nBCsPerOrbit> bcPatternC;
   std::bitset<nBCsPerOrbit> bcPatternB;
@@ -121,6 +126,12 @@ struct EventSelectionQaTask {
     strLPMProductionTag = metadataInfo.get("LPMProductionTag"); // to extract info from ccdb by the tag
     strPassName = metadataInfo.get(isMC ? "AnchorPassName" : "RecoPassName");
 
+    // for special selection of tracks within TPC (Oct 2026)
+    tpcSectorEdgeConfig.guardLowerCm = 0.5f;
+    tpcSectorEdgeConfig.guardUpperCm = 0.5f;
+    tpcSectorEdgeConfig.zMaxCm = 250.f;
+    tpcSectorEdgeConfig.maxSnp = 0.9f;
+
     const AxisSpec axisMultV0M{1000, 0., 40000., "V0M multiplicity"};
     const AxisSpec axisMultV0A{1000, 0., isLowFlux ? 40000. : 200000., "V0A multiplicity"};
     const AxisSpec axisMultV0C{1000, 0., 30000., "V0C multiplicity"};
@@ -390,6 +401,11 @@ struct EventSelectionQaTask {
       histos.add("occupancyQA/hNumTracksPVTPC_vs_V0A_vs_occupancy_StandardDeltaTimeCut", "", kTH3F, {axisMultV0AForOccup, axisNtracksPVTPC, axisOccupancyTracks});
       histos.add("occupancyQA/hNumTracksPV_vs_V0A_vs_occupancy_GoodITSLayersAllCut", "", kTH3F, {axisMultV0AForOccup, axisNtracksPV, axisOccupancyTracks});
       histos.add("occupancyQA/hNumTracksPVTPC_vs_V0A_vs_occupancy_GoodITSLayersAllCut", "", kTH3F, {axisMultV0AForOccup, axisNtracksPVTPC, axisOccupancyTracks});
+      // requested by TPC experts: check with tracks at given NrowsThreshold
+      if (useTestWithTrackTools) {
+        histos.add("occupancyQA/hNumTracksITS_isValidAtNrowsThreshold_EtaPtCuts_vs_V0A_vs_occupancy", "", kTH3F, {axisMultV0AForOccup, axisNtracksPVTPC, axisOccupancyTracks});
+        histos.add("occupancyQA/hNumTracksPV_isValidAtNrowsThreshold_EtaPtSel8VxCuts_vs_V0A_vs_occupancy", "", kTH3F, {axisMultV0AForOccup, axisNtracksPVTPC, axisOccupancyTracks});
+      }
       // requested by TPC experts: nTPConly tracks vs occupancy
       histos.add("occupancyQA/hNumTracksTPConly_vs_V0A_vs_occupancy", "", kTH3F, {axisMultV0AForOccup, axisNtracksTPConly, axisOccupancyTracks});
       histos.add("occupancyQA/hNumTracksTPConlyNoITS_vs_V0A_vs_occupancy", "", kTH3F, {axisMultV0AForOccup, axisNtracksTPConly, axisOccupancyTracks});
@@ -412,7 +428,7 @@ struct EventSelectionQaTask {
 
       histos.add("occupancyQA/dEdx_vs_centr_vs_occup_narrow_p_win", "dE/dx", kTH3F, {{20, 0, 4000, "n PV tracks"}, {60, 0, 15000, "occupancy"}, {800, 0.0, 800.0, "dE/dx (a. u.)"}});
     }
-  }
+  } // end of init()
 
   void processRun2(
     ColEvSels const& cols,
@@ -1185,6 +1201,8 @@ struct EventSelectionQaTask {
 
       int nTracksITS = 0;
       int nTracksITSTPC = 0;
+      int nTracksITSValidAtNrowsThresholdAfterEtaPtCuts = 0;
+      int nContributorsAtNrowsThresholdAfterEtaPtSel8VxCuts = 0;
 
       bool isTVX = col.selection_bit(kIsTriggerTVX);
 
@@ -1202,11 +1220,33 @@ struct EventSelectionQaTask {
             nTPConlyNoITS++;
         }
 
+        // Oct 2026: test presence of track at 85 cm radius using new tools - https://github.com/AliceO2Group/AliceO2/tree/dev/Common/TrackTools
+        bool isTrackWithNrowsAvailable = false;
+        if (useTestWithTrackTools) {
+          const float bzKG = 5.f;
+          const float radiusOfInterest = 85.f; // cm
+          auto trackParLocal = o2::recohelpers::makeTrackParFromLocalParameters(
+            track.x(),
+            track.alpha(),
+            track.y(),
+            track.z(),
+            track.snp(),
+            track.tgl(),
+            track.signed1Pt());
+          auto trackAt85 = o2::recohelpers::getParametersAtRadiusH(trackParLocal, radiusOfInterest, bzKG);
+          auto l0 = o2::tpc::recohelpers::sectorEdgeStackLinear(trackParLocal, bzKG, tpcSectorEdgeConfig);
+
+          isTrackWithNrowsAvailable = (trackAt85.valid() && l0.nRowsAvailable > thresholdNrowsForTrackToolTest);
+        }
+
         if (std::fabs(track.eta()) < 0.8 && track.pt() > 0.2) {
           if (track.hasITS()) {
             nTracksITS++;
             if (track.hasTPC())
               nTracksITSTPC++;
+            if (useTestWithTrackTools && isTrackWithNrowsAvailable) {
+              nTracksITSValidAtNrowsThresholdAfterEtaPtCuts++;
+            }
           }
         }
 
@@ -1234,12 +1274,18 @@ struct EventSelectionQaTask {
               histos.fill(HIST("occupancyQA/tpcNCrossedRows_vs_V0A_vs_occupancy"), multV0A, track.tpcNClsFindable() - tpcNClsFindableMinusCrossedRowsCorrected, occupancyByTracks);
             }
           } // end of hasTPC
-          if (col.sel8() && fabs(col.posZ()) < 10 && track.tpcNClsFound() > 50 && track.tpcNClsCrossedRows() > 80 && track.itsChi2NCl() < 36 && track.tpcChi2NCl() < 4) {
-            nContributorsAfterEtaTPCCuts++;
-            // ROF border QA
-            histos.fill(HIST("ITSROFborderQA/hFoundBC_kTVX_nITSlayers_for_ITSTPCtracks"), localBC, track.itsNCls());
-            histos.fill(HIST("ITSROFborderQA/hFoundBC_kTVX_counter_ITSTPCtracks"), localBC);
-          }
+          if (col.sel8() && fabs(col.posZ()) < 10) {
+            if (track.tpcNClsFound() > 50 && track.tpcNClsCrossedRows() > 80 && track.itsChi2NCl() < 36 && track.tpcChi2NCl() < 4) {
+              nContributorsAfterEtaTPCCuts++;
+              // ROF border QA
+              histos.fill(HIST("ITSROFborderQA/hFoundBC_kTVX_nITSlayers_for_ITSTPCtracks"), localBC, track.itsNCls());
+              histos.fill(HIST("ITSROFborderQA/hFoundBC_kTVX_counter_ITSTPCtracks"), localBC);
+            }
+
+            if (useTestWithTrackTools && isTrackWithNrowsAvailable) {
+              nContributorsAtNrowsThresholdAfterEtaPtSel8VxCuts++;
+            }
+          } // end of sel8 and vZ cuts
         }
         if (!track.hasTPC())
           histos.fill(HIST("hITStrackBcDiff"), trackBcDiff);
@@ -1268,6 +1314,12 @@ struct EventSelectionQaTask {
           histos.fill(HIST("occupancyQA/hNumTracksPVTPCLooseCuts_vs_V0A_vs_occupancy"), multV0A, nContributorsAfterEtaTPCLooseCuts, occupancyByTracks);
           histos.fill(HIST("occupancyQA/hNumTracksITS_vs_V0A_vs_occupancy"), multV0A, nTracksITS, occupancyByTracks);
           histos.fill(HIST("occupancyQA/hNumTracksITSTPC_vs_V0A_vs_occupancy"), multV0A, nTracksITSTPC, occupancyByTracks);
+
+          if (useTestWithTrackTools) {
+            histos.fill(HIST("occupancyQA/hNumTracksITS_isValidAtNrowsThreshold_EtaPtCuts_vs_V0A_vs_occupancy"), multV0A, nTracksITSValidAtNrowsThresholdAfterEtaPtCuts, occupancyByTracks);
+            histos.fill(HIST("occupancyQA/hNumTracksPV_isValidAtNrowsThreshold_EtaPtSel8VxCuts_vs_V0A_vs_occupancy"), multV0A, nContributorsAtNrowsThresholdAfterEtaPtSel8VxCuts, occupancyByTracks);
+          }
+
           if (col.selection_bit(kNoCollInTimeRangeNarrow)) {
             histos.fill(HIST("occupancyQA/hNumTracksPV_vs_V0A_vs_occupancy_NarrowDeltaTimeCut"), multV0A, nPV, occupancyByTracks);
             histos.fill(HIST("occupancyQA/hNumTracksPVTPC_vs_V0A_vs_occupancy_NarrowDeltaTimeCut"), multV0A, nContributorsAfterEtaTPCCuts, occupancyByTracks);

DPG/Tasks/TPC/treeCreatorPidTpcDiagnostics.cxx

@@ -91,6 +91,7 @@ struct TreeCreatorPidTpcDiagnostics {
   Configurable<bool> requireGoodRct{"requireGoodRct", false, "require good detector flag in run condtion table"};
 
   struct ParticleWiseCfgs : ConfigurableGroup {
+    std::string prefix = "particleWiseCfgs"; // JSON group name
 
 #define DECLARE_PARTICLE_WISE_CONFIGURABLES(Unused1, ParticleNameLong, Unused2)                                                                                                                                                                            \
   Configurable<float> cutTpcInnerParameterMin##ParticleNameLong{"cutTpcInnerParameterMin" #ParticleNameLong, 0.f, "Lower-value cut on tpcInnerParam for " #ParticleNameLong};    /* o2-linter: disable=name/configurable (Configurable defined in macro)*/ \
@@ -223,7 +224,8 @@ struct TreeCreatorPidTpcDiagnostics {
       isFirstCollision = false;
       const float ft0Occ = collision.ft0cOccupancyInTimeRange();
       const float multTPC = collision.multTPC() / MultiplicityNorm;
-      const auto hadronicRate = !irSource.empty() ? mRateFetcher.fetch(ccdb.service, bc.timestamp(), bc.runNumber(), irSource) * OneToKilo : 0.;
+      const int runnumber = bc.runNumber();
+      const auto hadronicRate = !irSource.empty() ? mRateFetcher.fetch(ccdb.service, bc.timestamp(), runnumber, irSource) * OneToKilo : 0.;
 
       const auto tracksFromCollision = tracks.sliceBy(perCollisionTracks, static_cast<int>(collision.globalIndex()));
 
@@ -279,7 +281,7 @@ struct TreeCreatorPidTpcDiagnostics {
           nSigmaTof = o2::aod::pidutils::tofNSigma<ParticleId>(track);
         }
 
-        rowPidTpcDiagnostics(isGoodRctEvent, ParticleId, ft0Occ, hadronicRate, multTPC, nClNormalized, nclPID, phi, tgl, tpcInnerParam, rapidity, momentum, signed1Pt, nSigmaTpc, dedxExpected, dedxDiff, expSigma, nSigmaTof);
+        rowPidTpcDiagnostics(isGoodRctEvent, ParticleId, ft0Occ, hadronicRate, multTPC, nClNormalized, nclPID, runnumber, phi, tgl, tpcInnerParam, rapidity, momentum, signed1Pt, nSigmaTpc, dedxExpected, dedxDiff, expSigma, nSigmaTof);
       } // tracksFromCollision
     } // collisions
     ++mProcessedParticles;

DPG/Tasks/TPC/treeCreatorPidTpcDiagnostics.h

@@ -41,6 +41,7 @@ DECLARE_SOA_TABLE(PidTpcDiagnostics, "AOD", "PIDTPCDIAG",
                   tpcskims::NormMultTPC,
                   tpcskims::NormNClustersTPC,
                   tpcskims::NormNClustersTPCPID,
+                  tpcskims::RunNumber,
                   o2::aod::track::Phi,
                   o2::aod::track::Tgl,
                   o2::aod::track::TPCInnerParam,

EventFiltering/PWGHF/HFFilterHelpers.h

@@ -2004,7 +2004,7 @@ inline void HfFilterHelper::setTpcRecalibMaps(o2::framework::Service<o2::ccdb::B
 
   for (size_t iMap = 0; iMap < mapNames.size(); iMap++) {
 
-    mHistMapPiPrKaDe[iMap] = reinterpret_cast<TH3F*>(calibList->FindObject(mapNames[iMap].data()));
+    mHistMapPiPrKaDe[iMap] = dynamic_cast<TH3F*>(calibList->FindObject(mapNames[iMap].data()));
     if (!mHistMapPiPrKaDe[iMap]) {
       LOG(fatal) << "Cannot find histogram: " << mapNames[iMap].data();
       return;

EventFiltering/PWGJE/jetFilter.cxx

@@ -98,7 +98,7 @@ struct jetFilter {
   void init(o2::framework::InitContext&)
   {
     triggerJetR = TMath::Nint(cfgJetR * 100.0f);
-    trackSelection = jetderiveddatautilities::initialiseTrackSelection(static_cast<std::string>(trackSelections));
+    trackSelection = jetderiveddatautilities::initialiseTrackSelection(trackSelections);
     eventSelectionBits = jetderiveddatautilities::initialiseEventSelectionBits(static_cast<std::string>(evSel));
 
     spectra.add("fCollZpos", "collision z position", HistType::kTH1F,

EventFiltering/PWGUD/diffractionBCFilter.cxx

@@ -112,11 +112,11 @@ struct tracksWGTInBCs {
           LOGF(debug, "  Number of BCs %d", atr.bc().size());
           if (atr.bc().size() > 0) {
             auto firstCompatibleBC = atr.bc().begin().globalBC();
-            closestBC = (uint64_t)(firstCompatibleBC +
-                                   (track.trackTime() / o2::constants::lhc::LHCBunchSpacingNS));
+            closestBC = static_cast<uint64_t>(firstCompatibleBC +
+                                              (track.trackTime() / o2::constants::lhc::LHCBunchSpacingNS));
             // update tracksInBCList
             LOGF(debug, "closestBC %d", closestBC);
-            tracksInBCList[closestBC].emplace_back((int32_t)track.globalIndex());
+            tracksInBCList[closestBC].emplace_back(static_cast<int32_t>(track.globalIndex()));
           }
         } else {
           // registry.get<TH1>(HIST("barrelTracks"))->Fill(2., 1.);
@@ -128,7 +128,7 @@ struct tracksWGTInBCs {
 
           // update tracksInBCList
           LOGF(debug, "closestBC %d", closestBC);
-          tracksInBCList[closestBC].emplace_back((int32_t)track.globalIndex());
+          tracksInBCList[closestBC].emplace_back(static_cast<int32_t>(track.globalIndex()));
         }
       }
       LOGF(debug, "track finished.\n");
@@ -195,12 +195,12 @@ struct tracksWGTInBCs {
           LOGF(debug, "  Number of BCs %d", aftr.bc().size());
           if (aftr.bc().size() > 0) {
             auto firstCompatibleBC = aftr.bc().begin().globalBC();
-            closestBC = (uint64_t)(firstCompatibleBC +
-                                   (fwdTrack.trackTime() / o2::constants::lhc::LHCBunchSpacingNS));
+            closestBC = static_cast<uint64_t>(firstCompatibleBC +
+                                              (fwdTrack.trackTime() / o2::constants::lhc::LHCBunchSpacingNS));
 
             // update fwdTracksWGTInBCList
             LOGF(debug, "closestBC %d", closestBC);
-            fwdTracksWGTInBCList[closestBC].emplace_back((int32_t)fwdTrack.globalIndex());
+            fwdTracksWGTInBCList[closestBC].emplace_back(static_cast<int32_t>(fwdTrack.globalIndex()));
           }
         } else {
           // registry.get<TH1>(HIST("forwardTracks"))->Fill(2., 1.);
@@ -212,7 +212,7 @@ struct tracksWGTInBCs {
 
           // update fwdTracksWGTInBCList
           LOGF(debug, "closestBC %d", closestBC);
-          fwdTracksWGTInBCList[closestBC].emplace_back((int32_t)fwdTrack.globalIndex());
+          fwdTracksWGTInBCList[closestBC].emplace_back(static_cast<int32_t>(fwdTrack.globalIndex()));
         }
       }
       LOGF(debug, "FwdTrack finished.\n");
@@ -282,7 +282,7 @@ struct DGBCFilterRun3 {
 
   void init(InitContext&)
   {
-    diffCuts = (DGCutparHolder)DGCuts;
+    diffCuts = DGCutparHolder(DGCuts);
   }
 
   // some general Collisions and Tracks filter

EventFiltering/PWGUD/diffractionFilter.cxx

@@ -89,13 +89,13 @@ struct DGFilterRun3 {
   {
     // reset collision counter
     collCounter = 0;
-    verbose = (int64_t)Verbose;
+    verbose = static_cast<int64_t>(Verbose);
     if (verbose <= 0) {
       verbose = 1000000000000;
     }
 
     // cut holder
-    diffCuts = (DGCutparHolder)diffCutsHolder;
+    diffCuts = DGCutparHolder(diffCutsHolder);
 
     // create histograms
     // stat