Merge branch 'AliceO2Group:master' into master

Author: sashingo

.github/labeler.yml

@@ -0,0 +1,52 @@
+---
+alice3:
+  - changed-files:
+      - any-glob-to-any-file: ['ALICE3/**']
+
+common:
+  - changed-files:
+      - any-glob-to-any-file: ['Common/**']
+
+infrastructure:
+  - changed-files:
+      - any-glob-to-any-file: ['.github/**', 'cmake/**', 'dependencies/**', 'packaging/**']
+
+dpg:
+  - changed-files:
+      - any-glob-to-any-file: ['DPG/**']
+
+pwgcf:
+  - changed-files:
+      - any-glob-to-any-file: ['PWGCF/**', '*/PWGCF/**']
+
+pwgdq:
+  - changed-files:
+      - any-glob-to-any-file: ['PWGDQ/**', '*/PWGDQ/**']
+
+pwgem:
+  - changed-files:
+      - any-glob-to-any-file: ['PWGEM/**', '*/PWGEM/**']
+
+pwghf:
+  - changed-files:
+      - any-glob-to-any-file: ['PWGHF/**', '*/PWGHF/**']
+
+pwgje:
+  - changed-files:
+      - any-glob-to-any-file: ['PWGJE/**', '*/PWGJE/**']
+
+pwglf:
+  - changed-files:
+      - any-glob-to-any-file: ['PWGLF/**', '*/PWGLF/**', 'PWGMM/**', '*/PWGMM/**']
+
+pwgud:
+  - changed-files:
+      - any-glob-to-any-file: ['PWGUD/**', '*/PWGUD/**']
+
+trigger:
+  - changed-files:
+      - any-glob-to-any-file: ['EventFiltering/**']
+
+tutorial:
+  - changed-files:
+      - any-glob-to-any-file: ['Tutorials/**']

.github/workflows/codeowner-self-approval.yml

@@ -13,7 +13,7 @@ permissions:
 
 jobs:
   approve:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     # Only run if the PR author enabled auto-merge, not someone else.
     # Also run if a new approval was created, as this affects whether we can
     # auto-approve. There is a risk of infinite loops here, though -- when we
@@ -25,7 +25,7 @@ jobs:
 
     steps:
       - name: Install dependencies
-        run: pip install --break-system-packages codeowners PyGithub
+        run: pip install codeowners PyGithub
 
       # Approve the PR, if the author is only editing files owned by themselves.
       - name: Auto-approve PR if permitted

.github/workflows/labeler.yml

@@ -0,0 +1,16 @@
+---
+name: "Pull Request Labeler"
+on:
+  - pull_request_target
+permissions: read-all
+
+jobs:
+  labeler:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - uses: actions/labeler@v5
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}

Common/Core/TrackSelectorPID.h

@@ -103,9 +103,10 @@ class TrackSelectorPidBase
   /// Checks if track is compatible with given particle species hypothesis within given TPC nσ range.
   /// \param track  track
   /// \param conditionalTof  variable to store the result of selection with looser cuts for conditional accepting of track if combined with TOF
+  /// \param tpcNSigmaCustom  custom TPC nσ value to be used for the selection, in case the desired value cannot be taken from the track table
   /// \return true if track satisfies TPC PID hypothesis for given TPC nσ range
   template <typename T>
-  bool isSelectedByTpc(const T& track, bool& conditionalTof)
+  bool isSelectedByTpc(const T& track, bool& conditionalTof, float tpcNSigmaCustom = -999.f)
   {
     // Accept if selection is disabled via large values.
     if (mNSigmaTpcMin < -999. && mNSigmaTpcMax > 999.) {
@@ -128,6 +129,11 @@ class TrackSelectorPidBase
       errorPdg();
     }
 
+    /// use custom TPC nσ, if a valid value is provided
+    if (tpcNSigmaCustom > -999.f) {
+      nSigma = tpcNSigmaCustom;
+    }
+
     if (mNSigmaTpcMinCondTof < -999. && mNSigmaTpcMaxCondTof > 999.) {
       conditionalTof = true;
     } else {
@@ -140,13 +146,13 @@ class TrackSelectorPidBase
   /// \param track  track
   /// \return TPC selection status (see TrackSelectorPID::Status)
   template <typename T>
-  TrackSelectorPID::Status statusTpc(const T& track)
+  TrackSelectorPID::Status statusTpc(const T& track, float tpcNSigmaCustom = -999.f)
   {
     if (!isValidForTpc(track)) {
       return TrackSelectorPID::NotApplicable;
     }
     bool condTof = false;
-    if (isSelectedByTpc(track, condTof)) {
+    if (isSelectedByTpc(track, condTof, tpcNSigmaCustom)) {
       return TrackSelectorPID::Accepted;
     } else if (condTof) {
       return TrackSelectorPID::Conditional; // potential to be accepted if combined with TOF
@@ -191,9 +197,10 @@ class TrackSelectorPidBase
   /// Checks if track is compatible with given particle species hypothesis within given TOF nσ range.
   /// \param track  track
   /// \param conditionalTpc  variable to store the result of selection with looser cuts for conditional accepting of track if combined with TPC
+  /// \param tofNSigmaCustom  custom TOF nσ value to be used for the selection, in case the desired value cannot be taken from the track table
   /// \return true if track satisfies TOF PID hypothesis for given TOF nσ range
   template <typename T>
-  bool isSelectedByTof(const T& track, bool& conditionalTpc)
+  bool isSelectedByTof(const T& track, bool& conditionalTpc, float tofNSigmaCustom = -999.f)
   {
     // Accept if selection is disabled via large values.
     if (mNSigmaTofMin < -999. && mNSigmaTofMax > 999.) {
@@ -216,6 +223,11 @@ class TrackSelectorPidBase
       errorPdg();
     }
 
+    /// use custom TOF nσ, if a valid value is provided
+    if (tofNSigmaCustom > -999.f) {
+      nSigma = tofNSigmaCustom;
+    }
+
     if (mNSigmaTofMinCondTpc < -999. && mNSigmaTofMaxCondTpc > 999.) {
       conditionalTpc = true;
     } else {
@@ -228,13 +240,13 @@ class TrackSelectorPidBase
   /// \param track  track
   /// \return TOF selection status (see TrackSelectorPID::Status)
   template <typename T>
-  TrackSelectorPID::Status statusTof(const T& track)
+  TrackSelectorPID::Status statusTof(const T& track, float tofNSigmaCustom = -999.f)
   {
     if (!isValidForTof(track)) {
       return TrackSelectorPID::NotApplicable;
     }
     bool condTpc = false;
-    if (isSelectedByTof(track, condTpc)) {
+    if (isSelectedByTof(track, condTpc, tofNSigmaCustom)) {
       return TrackSelectorPID::Accepted;
     } else if (condTpc) {
       return TrackSelectorPID::Conditional; // potential to be accepted if combined with TPC
@@ -391,10 +403,10 @@ class TrackSelectorPidBase
   /// \param track  track
   /// \return status of combined PID (TPC or TOF) (see TrackSelectorPID::Status)
   template <typename T>
-  TrackSelectorPID::Status statusTpcOrTof(const T& track)
+  TrackSelectorPID::Status statusTpcOrTof(const T& track, float tpcNSigmaCustom = -999.f, float tofNSigmaCustom = -999.f)
   {
-    int pidTpc = statusTpc(track);
-    int pidTof = statusTof(track);
+    int pidTpc = statusTpc(track, tpcNSigmaCustom);
+    int pidTof = statusTof(track, tofNSigmaCustom);
 
     if (pidTpc == TrackSelectorPID::Accepted || pidTof == TrackSelectorPID::Accepted) {
       return TrackSelectorPID::Accepted;
@@ -412,15 +424,15 @@ class TrackSelectorPidBase
   /// \param track  track
   /// \return status of combined PID (TPC and TOF) (see TrackSelectorPID::Status)
   template <typename T>
-  TrackSelectorPID::Status statusTpcAndTof(const T& track)
+  TrackSelectorPID::Status statusTpcAndTof(const T& track, float tpcNSigmaCustom = -999.f, float tofNSigmaCustom = -999.f)
   {
     int pidTpc = TrackSelectorPID::NotApplicable;
     if (track.hasTPC()) {
-      pidTpc = statusTpc(track);
+      pidTpc = statusTpc(track, tpcNSigmaCustom);
     }
     int pidTof = TrackSelectorPID::NotApplicable;
     if (track.hasTOF()) {
-      pidTof = statusTof(track);
+      pidTof = statusTof(track, tofNSigmaCustom);
     }
 
     if (pidTpc == TrackSelectorPID::Accepted && pidTof == TrackSelectorPID::Accepted) {

Common/TableProducer/Converters/bcFlagsCreator.cxx

@@ -22,7 +22,7 @@ struct bcFlagsCreator {
 
   void process(aod::BCs const& bcTable)
   {
-    for (auto& bc : bcTable) {
+    for (auto& _ : bcTable) {
       bcFlags(0);
     }
   }

Common/TableProducer/eventSelection.cxx

@@ -38,6 +38,7 @@ using BCsWithRun2InfosTimestampsAndMatches = soa::Join<aod::BCs, aod::Run2BCInfo
 using BCsWithRun3Matchings = soa::Join<aod::BCs, aod::Timestamps, aod::Run3MatchedToBCSparse>;
 using BCsWithBcSelsRun2 = soa::Join<aod::BCs, aod::Timestamps, aod::BcSels, aod::Run2BCInfos, aod::Run2MatchedToBCSparse>;
 using BCsWithBcSelsRun3 = soa::Join<aod::BCs, aod::Timestamps, aod::BcSels, aod::Run3MatchedToBCSparse>;
+using FullTracks = soa::Join<aod::Tracks, aod::TracksExtra>;
 using FullTracksIU = soa::Join<aod::TracksIU, aod::TracksExtra>;
 const double bcNS = o2::constants::lhc::LHCBunchSpacingNS;
 
@@ -446,7 +447,10 @@ struct EventSelectionTask {
   Configurable<bool> confUseWeightsForOccupancyVariable{"UseWeightsForOccupancyEstimator", 1, "Use or not the delta-time weights for the occupancy estimator"};
   Configurable<int> confSigmaBCforHighPtTracks{"confSigmaBCforHighPtTracks", 4, "Custom sigma (in bcs) for collisions with high-pt tracks"};
 
-  Partition<aod::Tracks> tracklets = (aod::track::trackType == static_cast<uint8_t>(o2::aod::track::TrackTypeEnum::Run2Tracklet));
+  Partition<FullTracks> tracklets = (aod::track::trackType == static_cast<uint8_t>(o2::aod::track::TrackTypeEnum::Run2Tracklet));
+
+  Preslice<FullTracks> perCollision = aod::track::collisionId;
+  Preslice<FullTracksIU> perCollisionIU = aod::track::collisionId;
 
   Service<o2::ccdb::BasicCCDBManager> ccdb;
   HistogramRegistry histos{"Histos", {}, OutputObjHandlingPolicy::AnalysisObject};
@@ -482,6 +486,10 @@ struct EventSelectionTask {
   // helper function to find closest TVX signal in time and in zVtx
   int64_t findBestGlobalBC(int64_t meanBC, int64_t sigmaBC, int32_t nContrib, float zVtxCol, std::map<int64_t, float>& mapGlobalBcVtxZ)
   {
+    // protection against
+    if (sigmaBC < 1)
+      sigmaBC = 1;
+
     int64_t minBC = meanBC - 3 * sigmaBC;
     int64_t maxBC = meanBC + 3 * sigmaBC;
     // TODO: use ITS ROF bounds to reduce the search range?
@@ -495,7 +503,7 @@ struct EventSelectionTask {
     float bestChi2 = 1e+10;
     int64_t bestGlobalBC = 0;
     for (std::map<int64_t, float>::iterator it = itMin; it != itMax; ++it) {
-      float chi2 = pow((it->second - zVtxCol) / zVtxSigma, 2) + pow((it->first - meanBC) / sigmaBC, 2.);
+      float chi2 = pow((it->second - zVtxCol) / zVtxSigma, 2) + pow(static_cast<float>(it->first - meanBC) / sigmaBC, 2.);
       if (chi2 < bestChi2) {
         bestChi2 = chi2;
         bestGlobalBC = it->first;
@@ -541,7 +549,7 @@ struct EventSelectionTask {
     evsel.reserve(collisions.size());
   }
 
-  void processRun2(aod::Collision const& col, BCsWithBcSelsRun2 const&, FullTracksIU const&, aod::FV0Cs const&)
+  void processRun2(aod::Collision const& col, BCsWithBcSelsRun2 const&, FullTracks const&, aod::FV0Cs const&)
   {
     auto bc = col.bc_as<BCsWithBcSelsRun2>();
     EventSelectionParams* par = ccdb->getForTimeStamp<EventSelectionParams>("EventSelection/EventSelectionParams", bc.timestamp());
@@ -788,7 +796,8 @@ struct EventSelectionTask {
         auto bc = col.bc_as<BCsWithBcSelsRun3>();
         int64_t globalBC = bc.globalBC();
         int64_t meanBC = globalBC + TMath::Nint(weightedTime / bcNS);
-        int64_t bestGlobalBC = findBestGlobalBC(meanBC, weightedSigma / bcNS, vNcontributors[colIndex], col.posZ(), mapGlobalBcVtxZ);
+        int64_t sigmaBC = TMath::CeilNint(weightedSigma / bcNS);
+        int64_t bestGlobalBC = findBestGlobalBC(meanBC, sigmaBC, vNcontributors[colIndex], col.posZ(), mapGlobalBcVtxZ);
         vFoundGlobalBC[colIndex] = bestGlobalBC > 0 ? bestGlobalBC : globalBC;
         vFoundBCindex[colIndex] = bestGlobalBC > 0 ? mapGlobalBcWithTVX[bestGlobalBC] : bc.globalIndex();
       }

Common/TableProducer/match-mft-ft0.cxx

@@ -109,11 +109,9 @@ T getCompatibleBCs(aod::AmbiguousMFTTrack const& atrack, aod::Collision const& c
   }
 
   int64_t maxBCId = bcIt.globalIndex();
-  auto maxGlobalBC = bcIt.globalBC();
 
   while (bcIt != bcs.end() && bcIt.globalBC() < lastBC + deltaBC) {
     maxBCId = bcIt.globalIndex();
-    maxGlobalBC = bcIt.globalBC();
 
     ++bcIt;
   }
@@ -149,12 +147,10 @@ T getCompatibleBCs(aod::MFTTracks::iterator const& track, aod::Collision const&
   // int64_t collLastBC = collFirstBC + 2*collOrig.collisionTimeRes()/o2::constants::lhc::LHCBunchSpacingNS +1;
 
   int64_t minBCId = bcIt.globalIndex();
-  uint64_t minGlobalBC = bcIt.globalBC();
 
   if ((int64_t)bcIt.globalBC() < firstBC + deltaBC) {
     while (bcIt != bcs.end() && (int64_t)bcIt.globalBC() < firstBC + deltaBC) {
       minBCId = bcIt.globalIndex();
-      minGlobalBC = bcIt.globalBC();
 
       ++bcIt;
     }
@@ -164,19 +160,16 @@ T getCompatibleBCs(aod::MFTTracks::iterator const& track, aod::Collision const&
     }
     // minGlobalBC needs to be >= to firstBC+deltaBC
     minBCId = bcIt.globalIndex();
-    minGlobalBC = bcIt.globalBC();
 
   } else {
     // here bcIt.globalBC() >= firstBC + deltaBC
 
     while (bcIt != bcs.begin() && (int64_t)bcIt.globalBC() >= (int64_t)firstBC + deltaBC) {
       minBCId = bcIt.globalIndex();
-      minGlobalBC = bcIt.globalBC();
       --bcIt;
     }
     if (bcIt == bcs.begin() && (int64_t)bcIt.globalBC() >= (int64_t)firstBC + deltaBC) {
       minBCId = bcIt.globalIndex();
-      minGlobalBC = bcIt.globalBC();
     }
     ++bcIt; // retrieve the pointer which gave minBCId and minGlobalBC
     if (bcIt == bcs.end()) {
@@ -185,7 +178,6 @@ T getCompatibleBCs(aod::MFTTracks::iterator const& track, aod::Collision const&
   }
 
   int64_t maxBCId = bcIt.globalIndex();
-  uint64_t maxGlobalBC = bcIt.globalBC();
 
   if ((int64_t)bcIt.globalBC() > (int64_t)lastBC + deltaBC) {
     // the previous minimum is actually bigger than the right boundary
@@ -218,7 +210,6 @@ T getCompatibleBCs(aod::MFTTracks::iterator const& track, aod::Collision const&
 
   while (bcIt != bcs.end() && (int64_t)bcIt.globalBC() <= (int64_t)lastBC + deltaBC) {
     maxBCId = bcIt.globalIndex();
-    maxGlobalBC = bcIt.globalBC();
 
     ++bcIt;
   }

Common/TableProducer/multiplicityTable.cxx

@@ -565,8 +565,6 @@ struct MultiplicityTable {
               }
             }
 
-            int bcNumber = bc.globalBC() % 3564;
-
             tableExtra(collision.numContrib(), collision.chi2(), collision.collisionTimeRes(),
                        mRunNumber, collision.posZ(), collision.sel8(),
                        nHasITS, nHasTPC, nHasTOF, nHasTRD, nITSonly, nTPConly, nITSTPC,