Merge branch 'AliceO2Group:master' into dev4

Author: VDiBella

CODEOWNERS

@@ -75,7 +75,7 @@
 /PWGMM/Lumi @alibuild @omvazque @mpuccio @skundu692 @aalkin @jgcn @gbencedi @abmodak
 /PWGMM/UE   @alibuild @omvazque @mpuccio @skundu692 @aalkin @aortizve @jgcn
 
-/PWGUD @alibuild @amatyja @rolavick
+/PWGUD @alibuild @amatyja @ekryshen
 /PWGJE @alibuild @nzardosh @fjonasALICE @jaimenorman @mhemmer-cern
 /Tools/PIDML @alibuild @saganatt
 /Tools/ML @alibuild @fcatalan92 @fmazzasc @ChSonnabend
@@ -86,4 +86,4 @@
 /Tutorials/PWGJE @alibuild @nzardosh @fjonasALICE @jaimenorman
 /Tutorials/PWGLF @alibuild @alcaliva @lbariogl @BongHwi @lbarnby @ercolessi @iravasen @njacazio @romainschotter @skundu692 @lhusova
 /Tutorials/PWGMM @alibuild @aalkin @ddobrigk
-/Tutorials/PWGUD @alibuild @pbuehler @amatyja
+/Tutorials/PWGUD @alibuild @amatyja @ekryshen

PWGCF/Core/AnalysisConfigurableCuts.h

@@ -151,7 +151,7 @@ class SimpleInclusiveCut : public TNamed
   SimpleInclusiveCut& operator=(const SimpleInclusiveCut&);
 
  private:
-  ClassDef(SimpleInclusiveCut, 1);
+  ClassDefOverride(SimpleInclusiveCut, 1);
 };
 
 } // namespace analysis

PWGCF/EbyEFluctuations/Tasks/radialFlowDecorr.cxx

@@ -233,6 +233,6 @@ class FlowPtContainer : public TNamed
   void getSubevents(int k, int n, std::vector<int>& current, std::vector<std::vector<int>>& subevents);
   static constexpr std::array<float, 9> FactorialArray = {1., 1., 2., 6., 24., 120., 720., 5040., 40320.};
   static constexpr std::array<int, 9> SignArray = {1, -1, 1, -1, 1, -1, 1, -1, 1};
-  ClassDef(FlowPtContainer, 2);
+  ClassDefOverride(FlowPtContainer, 2);
 };
 #endif // PWGCF_GENERICFRAMEWORK_CORE_FLOWPTCONTAINER_H_

PWGCF/GenericFramework/Core/FlowPtContainer.h

@@ -134,10 +134,10 @@ enum EMiscHistograms {
   eMiscHistograms_N
 };
 
-enum EExternalHistograms {
+enum EWeightsHistograms {
   ePhi = 0,
   ePt,
-  eExternalHistograms_N
+  eWeightsHistograms_N
 };
 
 enum EObservables {
@@ -159,7 +159,7 @@ static constexpr std::array<const char*, eMultiplicityTables_N> MultiplicityTabl
   "multFT0M",
   "multNTracksPV"};
 
-static constexpr std::array<const char*, eExternalHistograms_N> WeightsNames = {
+static constexpr std::array<const char*, eWeightsHistograms_N> WeightsNames = {
   "ePhi",
   "ePt"};
 
@@ -187,7 +187,7 @@ struct MultiparticleCorrelationsMei // this name is used in lower-case format to
 
   // *) external root files
   Configurable<bool> cfExternalFileSwitch{"cfExternalFileSwitch", false, "choose to include external root files or not"};
-  Configurable<std::string> cfFileWithWeights{"cfFileWithWeights", "/alice-ccdb.cern.ch/Users/m/mei/O2challenge-", "path to external ROOT file which holds all particle weights"};
+  Configurable<std::string> cfFileWithWeights{"cfFileWithWeights", "/alice-ccdb.cern.ch/Users/m/mei/thesis-", "path to external ROOT file which holds all particle weights"};
 
   // *) binnings
   Configurable<bool> cfALICECentBinSwitch{"cfALICECentBinSwitch", true, "switch on or off to use ALICE default binning"};
@@ -219,6 +219,7 @@ struct MultiparticleCorrelationsMei // this name is used in lower-case format to
   // *) misc
   Configurable<double> sigmaInel{"sigmaInel", 7.71, "inelastic cross section in mb"};
   Configurable<bool> qualityAssuranceSwitch{"qualityAssuranceSwitch", false, "quality assurance switch"};
+  Configurable<bool> runMessageSwitch{"runMessageSwitch", false, "run message switch"};
 
   // *) Define and initialize all data members to be called in the main process* functions:
   // **) Task configuration:
@@ -247,7 +248,7 @@ struct MultiparticleCorrelationsMei // this name is used in lower-case format to
   // *) External histograms:
   struct ExternalHistograms {
     TList* fExternalHistogramsList = nullptr;
-    std::array<std::array<TH1F*, eCuts_N>, eExternalHistograms_N> fWeights{}; //! [type][before, after cuts]
+    std::array<std::array<TH1F*, eCuts_N>, eWeightsHistograms_N> fWeights{}; //! [type][before, after cuts]
   } ex;
 
   struct Observables {
@@ -275,7 +276,7 @@ struct MultiparticleCorrelationsMei // this name is used in lower-case format to
   }
 
   template <typename T1>
-  void updateQVectorsTable(std::vector<std::vector<TComplex>>& QVectorsTable, T1 phi, T1 weight = T1(1))
+  void updateQVectorsTable(std::vector<std::vector<TComplex>>& QVectorsTable, T1 const& phi, T1 weight = T1(1))
   {
     const int maxHarmonic = QVectorsTable.size();
     const int maxPower = QVectorsTable.empty() ? 0 : QVectorsTable[0].size();
@@ -526,9 +527,9 @@ struct MultiparticleCorrelationsMei // this name is used in lower-case format to
 
   // templates
   template <typename T1>
-  float chooseCent(T1 const& collision)
+  float chooseCent(T1 const& collision, int const& whichEstimator)
   {
-    switch (centralityEstimator) {
+    switch (whichEstimator) {
       case eFT0C:
         return static_cast<float>(collision.centFT0C());
       case eFT0M:
@@ -544,9 +545,9 @@ struct MultiparticleCorrelationsMei // this name is used in lower-case format to
   }
 
   template <typename T1>
-  float chooseMult(T1 const& collision)
+  float chooseMult(T1 const& collision, int const& whichTable)
   {
-    switch (multiplicityTables) {
+    switch (whichTable) {
       case eMultTPC:
         return static_cast<float>(collision.multTPC());
       case eMultFV0M:
@@ -598,8 +599,8 @@ struct MultiparticleCorrelationsMei // this name is used in lower-case format to
     if constexpr (rs == eRec || rs == eRecAndSim) {
       // Fill reconstructed-level event histograms
       if (rm == eReal) {
-        auto thisCent = chooseCent(collision);
-        auto thisRefMult = chooseMult(collision);
+        auto thisCent = chooseCent(collision, centralityEstimator);
+        auto thisRefMult = chooseMult(collision, multiplicityTables);
         int multiplicityRec = static_cast<int>(tracks.size());
         if constexpr (cuts == eBefore) {
           ec.fEventHist[eHistMultiplicity][eRec][eBefore]->Fill(multiplicityRec);
@@ -772,10 +773,13 @@ struct MultiparticleCorrelationsMei // this name is used in lower-case format to
 
   void loadWeights(int runNumber)
   {
-    for (int i = 0; i < eExternalHistograms_N; ++i) {
+    for (int i = 0; i < eWeightsHistograms_N; ++i) {
       for (int j = 0; j < eCuts_N; ++j) {
-        ex.fWeights[i][j] =
-          getHistogramWithWeights(cfFileWithWeights.value.c_str(), Form("%d", runNumber), Form("[%s][%s]", WeightsNames[i], CutsNames[j]));
+        ex.fWeights[i][j] = getHistogramWithWeights(cfFileWithWeights.value.c_str(), Form("%d", runNumber), Form("[%s][%s]", WeightsNames[i], CutsNames[j]));
+        if (!ex.fWeights[i][j]) {
+          LOGF(info, "[%s][%s] not found", WeightsNames[i], CutsNames[j]);
+          continue;
+        }
         ex.fExternalHistogramsList->Add(ex.fWeights[i][j]);
       }
     }
@@ -784,7 +788,7 @@ struct MultiparticleCorrelationsMei // this name is used in lower-case format to
   template <ERecSim rs, typename T1>
   void qaFill(T1 const& collision)
   {
-    auto thisCent = chooseCent(collision);
+    auto thisCent = chooseCent(collision, centralityEstimator);
     if constexpr (rs == eRecAndSim || rs == eSim) {
       if (!collision.has_mcCollision()) {
         return;
@@ -807,7 +811,10 @@ struct MultiparticleCorrelationsMei // this name is used in lower-case format to
     if (tc.fDryRun) {
       return;
     }
-    int thisRunNumber = collision.bc().runNumber();
+    const int thisRunNumber = collision.bc().runNumber();
+    if (runMessageSwitch) {
+      LOGF(info, "Successfully running, run number is %d", thisRunNumber);
+    }
 
     if (isFirstCollision) {
       // Get run number
@@ -848,27 +855,30 @@ struct MultiparticleCorrelationsMei // this name is used in lower-case format to
     auto track = tracks.iteratorAt(0); // set the type and scope from one instance
     for (int64_t i = 0; i < tracks.size(); i++) {
       track = tracks.iteratorAt(i);
-      const float thisPhi = track.phi();
-      const float thisPt = track.pt();
-      float wPhiBefore = 1.f;
-      float wPhiAfter = 1.f;
-      float wPtBefore = 1.f;
-      float wPtAfter = 1.f;
-      if (cfExternalFileSwitch && ex.fWeights[ePhi][eBefore]) {
-        wPhiBefore = ex.fWeights[ePhi][eBefore]->GetBinContent(ex.fWeights[ePhi][eBefore]->FindBin(thisPhi));
-        wPhiAfter = ex.fWeights[ePhi][eAfter]->GetBinContent(ex.fWeights[ePhi][eAfter]->FindBin(thisPhi));
-        wPtBefore = ex.fWeights[ePt][eBefore]->GetBinContent(ex.fWeights[ePt][eBefore]->FindBin(thisPt));
-        wPtAfter = ex.fWeights[ePt][eAfter]->GetBinContent(ex.fWeights[ePt][eAfter]->FindBin(thisPt));
+      float thisPhi = track.phi();
+      float thisPt = track.pt();
+      std::array<float, 2> thisPhiAndPt = {thisPhi, thisPt};
+      std::array<std::array<float, 2>, 2> thisWeights = {{{1.f, 1.f}, {1.f, 1.f}}}; // {{wPhiBefore, wPhiAfter},{wPtBefore,  wPtAfter}}
+
+      // eWeightsHistograms_N
+      if (cfExternalFileSwitch) {
+        for (int k = 0; k < eWeightsHistograms_N; ++k) {
+          for (int j = 0; j < eCuts_N; ++j) {
+            if (ex.fWeights[k][j]) {
+              thisWeights[k][j] = ex.fWeights[k][j]->GetBinContent(ex.fWeights[k][j]->FindBin(thisPhiAndPt[k]));
+            }
+          }
+        }
       }
 
       particleHistFill<rs, eReal, eBefore>(track);
       particleHistFill<rs, eMC, eBefore>(track);
-      updateQVectorsTable(qVectorsTableBeforeCutsReal, thisPhi, wPhiBefore * wPtBefore);
+      updateQVectorsTable(qVectorsTableBeforeCutsReal, thisPhi, thisWeights[ePhi][eBefore] * thisWeights[ePt][eBefore]);
 
       if (cfMasterCutSwitch) {
         if (passesEventCutsReal && particleCuts<rs, eReal>(track)) {
           particleHistFill<rs, eReal, eAfter>(track);
-          updateQVectorsTable(qVectorsTableAfterCutsReal, thisPhi, wPhiAfter * wPtAfter);
+          updateQVectorsTable(qVectorsTableAfterCutsReal, thisPhi, thisWeights[ePhi][eAfter] * thisWeights[ePt][eAfter]);
         }
         if (passesEventCutsMC && particleCuts<rs, eMC>(track)) {
           particleHistFill<rs, eMC, eAfter>(track);

PWGCF/MultiparticleCorrelations/Tasks/multiparticleCorrelationsMei.cxx

@@ -11,7 +11,7 @@
 
 o2physics_add_dpl_workflow(filter-correlations
                     SOURCES filterCorrelations.cxx
-                    PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGCFCore
+                    PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGCFCore O2Physics::EventFilteringUtils
                     COMPONENT_NAME Analysis)
 
 o2physics_add_dpl_workflow(filter-correlations-2prong

PWGCF/TableProducer/CMakeLists.txt

@@ -15,6 +15,7 @@
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/CCDB/TriggerAliases.h"
 #include "Common/Core/TableHelper.h"
+#include "Common/Core/Zorro.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
@@ -92,7 +93,7 @@ struct FilterCF {
   O2_DEFINE_CONFIGURABLE(cfgCutMCPt, float, 0.5f, "Minimal pT for particles");
   O2_DEFINE_CONFIGURABLE(cfgCutMCEta, float, 0.8f, "Eta range for particles");
   O2_DEFINE_CONFIGURABLE(cfgVerbosity, int, 1, "Verbosity level (0 = major, 1 = per collision)");
-  O2_DEFINE_CONFIGURABLE(cfgTrigger, int, 7, "Trigger choice: (0 = none, 7 = sel7, 8 = sel8, 9 = sel8 + kNoSameBunchPileup + kIsGoodZvtxFT0vsPV, 10 = sel8 before April, 2024, 11 = sel8 for MC, 12 = sel8 with low occupancy cut, 13 = sel8 + kNoSameBunchPileup + kIsGoodITSLayersAll -- for OO/NeNe) ");
+  O2_DEFINE_CONFIGURABLE(cfgTrigger, int, 7, "Trigger choice: (0 = none, 7 = sel7, 8 = sel8, 9 = sel8 + kNoSameBunchPileup + kIsGoodZvtxFT0vsPV, 10 = sel8 before April, 2024, 11 = sel8 for MC, 12 = sel8 with low occupancy cut, 13 = sel8 + kNoSameBunchPileup + kIsGoodITSLayersAll -- for OO/NeNe, 14 = fHighTrackMult (pp), 15 = fHighMultFv0 (pp), 16 = fHighTrackMult || fHighMultFv0 (pp))");
   O2_DEFINE_CONFIGURABLE(cfgMinOcc, int, 0, "minimum occupancy selection");
   O2_DEFINE_CONFIGURABLE(cfgMaxOcc, int, 3000, "maximum occupancy selection");
   O2_DEFINE_CONFIGURABLE(cfgCollisionFlags, uint16_t, aod::collision::CollisionFlagsRun2::Run2VertexerTracks, "Request collision flags if non-zero (0 = off, 1 = Run2VertexerTracks)");
@@ -135,6 +136,9 @@ struct FilterCF {
 
   HistogramRegistry registrytrackQA{"TrackQA", {}, OutputObjHandlingPolicy::AnalysisObject, true, true};
 
+  Zorro zorro;
+  int zorroRun = 0;
+
   Produces<aod::CFCollisions> outputCollisions;
   Produces<aod::CFCollisionsExtra> outputCollisionsExtra;
   Produces<aod::CFTracks> outputTracks;
@@ -194,12 +198,13 @@ struct FilterCF {
           return;
         }
         localMultiplicityEfficiency.reset(dynamic_cast<THn*>(efficiency->Clone()));
-      } else {
-        ccdb->setURL("http://alice-ccdb.cern.ch");
-        ccdb->setCaching(true);
-        ccdb->setLocalObjectValidityChecking();
       }
     }
+    if ((cfgTrigger >= 14 && cfgTrigger <= 16) || (!cfgEfficiencyMultiplicity.value.empty() && cfgLocalEfficiency == 0)) { // o2-linter: disable=magic-number (documented legacy trigger-selection code)
+      ccdb->setURL("http://alice-ccdb.cern.ch");
+      ccdb->setCaching(true);
+      ccdb->setLocalObjectValidityChecking();
+    }
     if (doprocessTrackQA) {
       registrytrackQA.add("zvtx", "Z Vertex position;  posz (cm); Events", HistType::kTH1F, {{100, -12, 12}});
       registrytrackQA.add("eta", "eta distribution;  eta; arb. units", HistType::kTH1F, {{100, -2, 2}});
@@ -249,6 +254,26 @@ struct FilterCF {
     if (cfgTrigger == 13) { // relevant for pO/OO/NeNe, recommended by Physics Board on 27.01.2026; o2-linter: disable=magic-number (documented legacy trigger-selection code)
       return isMultSelected && collision.sel8() && collision.selection_bit(aod::evsel::kNoSameBunchPileup) && collision.selection_bit(aod::evsel::kIsGoodZvtxFT0vsPV);
     }
+
+    // Zorro-based trigger selection
+    if (cfgTrigger >= 14 && cfgTrigger <= 16) { // o2-linter: disable=magic-number (documented legacy trigger-selection code)
+      auto bc = collision.template bc_as<aod::BCsWithTimestamps>();
+      if (zorroRun != bc.runNumber()) {
+        std::string zorroMask;
+        if (cfgTrigger == 14) { // High-multiplicity pp trigger based on tracks (PWGMM/multFilter.cxx); o2-linter: disable=magic-number (documented legacy trigger-selection code)
+          zorroMask = "fHighTrackMult";
+        }
+        if (cfgTrigger == 15) { // High-multiplicity pp trigger based on FV0 amplitude (PWGMM/multFilter.cxx); o2-linter: disable=magic-number (documented legacy trigger-selection code)
+          zorroMask = "fHighMultFv0";
+        }
+        if (cfgTrigger == 16) { // High-multiplicity pp trigger based on tracks or FV0 amplitude (PWGMM/multFilter.cxx); o2-linter: disable=magic-number (documented legacy trigger-selection code)
+          zorroMask = "fHighTrackMult,fHighMultFv0";
+        }
+        zorro.initCCDB(ccdb.service, bc.runNumber(), bc.timestamp(), zorroMask);
+        zorroRun = bc.runNumber();
+      }
+      return isMultSelected && zorro.isSelected(bc.globalBC(), 0); // Set BC threshold to zero to not admit nearby low-multiplicity collisions
+    }
     return false;
   }
 
@@ -488,7 +513,7 @@ struct FilterCF {
   }
   PROCESS_SWITCH(FilterCF, processDataMults, "Process data with multiplicity sets", false);
 
-  void processTrackQA(soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::CFMultiplicities>>::iterator const& collision, soa::Filtered<soa::Join<aod::Tracks, aod::TracksExtra, aod::TrackSelection, aod::TracksDCA>> const& tracks)
+  void processTrackQA(soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::CFMultiplicities>>::iterator const& collision, aod::BCsWithTimestamps const&, soa::Filtered<soa::Join<aod::Tracks, aod::TracksExtra, aod::TrackSelection, aod::TracksDCA>> const& tracks)
   {
     if (!keepCollision(collision)) {
       return;

PWGCF/TableProducer/filterCorrelations.cxx

@@ -119,7 +119,7 @@ class EventSelectionFilterAndAnalysis : public SelectionFilterAndAnalysis
   CutBrick<float>* mZVertex;                      //! the z vertex selection cuts
   PileUpRejBrick* mPileUpRejection;               //! the pile-up rejection criteria
 
-  ClassDef(EventSelectionFilterAndAnalysis, 1)
+  ClassDefOverride(EventSelectionFilterAndAnalysis, 1)
 };
 
 /// \brief Stores the different multiplicities needed for proper collision filtering

PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.h

@@ -145,7 +145,7 @@ class PIDSelectionFilterAndAnalysis : public SelectionFilterAndAnalysis
   std::vector<CutBrick<float>*> mCloseNsigmasTOF;
   std::vector<CutBrick<float>*> mBayesProbability;
 
-  ClassDef(PIDSelectionFilterAndAnalysis, 1);
+  ClassDefOverride(PIDSelectionFilterAndAnalysis, 1);
 };
 
 /// \brief Fills the filter cuts mask

PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.h

@@ -98,7 +98,7 @@ class CutBrick : public TNamed
   BrickStatus mState = kPASSIVE;
   BrickMode mMode = kUNSELECTED;
 
-  ClassDef(CutBrick, 1);
+  ClassDefOverride(CutBrick, 1);
 };
 
 /// \class CutBrickLimit
@@ -452,7 +452,7 @@ class CutWithVariations : public CutBrick<TValueToFilter>
   bool mAllowSeveralDefaults; ///< true if allows to store several cut default values
   TList mDefaultBricks;       ///< the list with the cut default values bricks
   TList mVariationBricks;     ///< the list with the cut variation values bricks
-  ClassDef(CutWithVariations, 1);
+  ClassDefOverride(CutWithVariations, 1);
 };
 
 /// \class SpecialCutBrick
@@ -503,7 +503,7 @@ class SpecialCutBrick : public TNamed
   BrickStatus mState = kPASSIVE;
   BrickMode mMode = kUNSELECTED;
 
-  ClassDef(SpecialCutBrick, 1);
+  ClassDefOverride(SpecialCutBrick, 1);
 };
 
 class TrackSelectionBrick : public SpecialCutBrick
@@ -626,7 +626,7 @@ class TrackSelectionBrick : public SpecialCutBrick
   // vector of ITS requirements (minNRequiredHits in specific requiredLayers)
   std::vector<std::pair<int8_t, std::set<uint8_t>>> mRequiredITSHits{};
 
-  ClassDef(TrackSelectionBrick, 1);
+  ClassDefOverride(TrackSelectionBrick, 1);
 };
 
 } // namespace PWGCF