Merge branch 'AliceO2Group:master' into master

Author: YazhenLin

Common/Tools/EventSelectionModule.h

@@ -310,6 +310,7 @@ class BcSelectionModule
       return;
     }
     bcselbuffer.clear();
+    bcselbuffer.reserve(bcs.size());
     for (const auto& bc : bcs) {
       uint64_t timestamp = timestamps[bc.globalIndex()];
       par = ccdb->template getForTimeStamp<EventSelectionParams>("EventSelection/EventSelectionParams", timestamp);
@@ -453,6 +454,7 @@ class BcSelectionModule
 
     int run = bcs.iteratorAt(0).runNumber();
 
+    bcselbuffer.reserve(bcs.size());
     // bc loop
     for (auto bc : bcs) { // o2-linter: disable=const-ref-in-for-loop (use bc as nonconst iterator)
       uint64_t timestamp = timestamps[bc.globalIndex()];

PWGCF/Flow/Tasks/flowSP.cxx

@@ -118,13 +118,13 @@ struct FlowSP {
     O2_DEFINE_CONFIGURABLE(cCentNGlobal, bool, false, "Set centrality estimator to CentNGlobal");
     // Standard selections
     O2_DEFINE_CONFIGURABLE(cTrackSelsDCAxy, float, 0.2, "Cut on DCA in the transverse direction (cm)");
-    O2_DEFINE_CONFIGURABLE(cTrackSelsDCAz, float, 2, "Cut on DCA in the longitudinal direction (cm)");
+    O2_DEFINE_CONFIGURABLE(cTrackSelsDCAz, float, 0.2, "Cut on DCA in the longitudinal direction (cm)");
     O2_DEFINE_CONFIGURABLE(cTrackSelsNcls, float, 70, "Cut on number of TPC clusters found");
     O2_DEFINE_CONFIGURABLE(cTrackSelsFshcls, float, 0.4, "Cut on fraction of shared TPC clusters found");
     O2_DEFINE_CONFIGURABLE(cTrackSelsPtmin, float, 0.2, "minimum pt (GeV/c)");
     O2_DEFINE_CONFIGURABLE(cTrackSelsPtmax, float, 10, "maximum pt (GeV/c)");
     O2_DEFINE_CONFIGURABLE(cTrackSelsEta, float, 0.8, "eta cut");
-    O2_DEFINE_CONFIGURABLE(cIsMCReco, bool, true, "Is MC Reco");
+    O2_DEFINE_CONFIGURABLE(cIsMCReco, bool, false, "Is MC Reco");
     O2_DEFINE_CONFIGURABLE(cEvSelsVtxZ, float, 10, "vertex cut (cm)");
     O2_DEFINE_CONFIGURABLE(cMagField, float, 99999, "Configurable magnetic field;default CCDB will be queried");
     O2_DEFINE_CONFIGURABLE(cCentMin, float, 0, "Minimum cenrality for selected events");
@@ -469,7 +469,6 @@ struct FlowSP {
         histos.add("QA/after/PsiA_vs_Vz", "", {HistType::kTH2D, {axisPhiPlane, axisVz}});
         histos.add("QA/after/PsiC_vs_Vz", "", {HistType::kTH2D, {axisPhiPlane, axisVz}});
         histos.add("QA/after/PsiFull_vs_Vz", "", {HistType::kTH2D, {axisPhiPlane, axisVz}});
-        // histos.add("QA/after/DeltaPsivsPx", "", {HistType::kTH3D, {axisCent, axisPhiPlane, axisPx}});
       }
 
       if (cfg.cFillQABefore) {
@@ -571,6 +570,8 @@ struct FlowSP {
         registry.add<TProfile>("QQCorrelations/qAXqCY", "", kTProfile, {axisCent});
         registry.add<TProfile>("QQCorrelations/qAYqCX", "", kTProfile, {axisCent});
         registry.add<TProfile>("QQCorrelations/qAXYqCXY", "", kTProfile, {axisCent});
+        registry.add<TProfile3D>("shift/ShiftZDCC", "ShiftZDCC", kTProfile3D, {{100, 0, 100}, {2, 0, 2}, {10, 0, 10}});
+        registry.add<TProfile3D>("shift/ShiftZDCA", "ShiftZDCA", kTProfile3D, {{100, 0, 100}, {2, 0, 2}, {10, 0, 10}});
 
         if (cfg.cFillGeneralV1Histos) {
           // track properties per centrality and per eta, pt bin
@@ -626,8 +627,7 @@ struct FlowSP {
           registry.add<TProfile3D>("incl/vnFull_EP", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality});
         }
         if (cfg.cFillEventPlaneQA) {
-          histos.add<TH1>("QA/hSPplaneA", "hSPplaneA", kTH1D, {axisPhiPlane});
-          histos.add<TH1>("QA/hSPplaneC", "hSPplaneC", kTH1D, {axisPhiPlane});
+          histos.add<TH2>("QA/hSPplaneAC", "hSPplaneAC", kTH2D, {axisPhiPlane, axisPhiPlane});
           histos.add<TH1>("QA/hSPplaneFull", "hSPplaneFull", kTH1D, {axisPhiPlane});
           histos.add<TProfile>("QA/hCosPhiACosPhiC", "hCosPhiACosPhiC; Centrality(%); #LT Cos(#Psi^{A})Cos(#Psi^{C})#GT", kTProfile, {axisCent});
           histos.add<TProfile>("QA/hSinPhiASinPhiC", "hSinPhiASinPhiC; Centrality(%); #LT Sin(#Psi^{A})Sin(#Psi^{C})#GT", kTProfile, {axisCent});
@@ -1178,7 +1178,6 @@ struct FlowSP {
         histos.fill(HIST("QA/") + HIST(Time[ft]) + HIST("/PsiA_vs_Vz"), psiA, collision.posZ(), spm.centWeight);
         histos.fill(HIST("QA/") + HIST(Time[ft]) + HIST("/PsiC_vs_Vz"), psiC, collision.posZ(), spm.centWeight);
         histos.fill(HIST("QA/") + HIST(Time[ft]) + HIST("/PsiFull_vs_Vz"), psiFull, collision.posZ(), spm.centWeight);
-        // histos.fill(HIST("QA/") + HIST(Time[ft]) + HIST("/DeltaPsivsPx"), spm.centrality, psiA - psiC - constants::math::PI, track.px(), spm.centWeight);
       }
     }
     return;
@@ -1424,6 +1423,8 @@ struct FlowSP {
     spm.psiA = 1.0 * std::atan2(spm.qyA, spm.qxA);
     spm.psiC = 1.0 * std::atan2(spm.qyC, spm.qxC);
 
+    int nshift = 10; // no. of iterations
+
     // https://twiki.cern.ch/twiki/pub/ALICE/DirectedFlowAnalysisNote/vn_ZDC_ALICE_INT_NOTE_version02.pdf
     spm.psiFull = 1.0 * std::atan2(spm.qyA + spm.qyC, spm.qxA + spm.qxC);
 
@@ -1434,13 +1435,18 @@ struct FlowSP {
     registry.fill(HIST("QQCorrelations/qAXYqCXY"), spm.centrality, spm.qyA * spm.qxC + spm.qxA * spm.qyC);
     registry.fill(HIST("QQCorrelations/qAqCX"), spm.centrality, spm.qxA * spm.qxC);
     registry.fill(HIST("QQCorrelations/qAqCY"), spm.centrality, spm.qyA * spm.qyC);
+    for (int ishift = 1; ishift <= nshift; ishift++) {
+      registry.fill(HIST("shift/ShiftZDCC"), spm.centrality, 0.5, ishift - 0.5, std::sin(ishift * 1.0 * spm.psiC));
+      registry.fill(HIST("shift/ShiftZDCC"), spm.centrality, 1.5, ishift - 0.5, std::cos(ishift * 1.0 * spm.psiC));
+      registry.fill(HIST("shift/ShiftZDCA"), spm.centrality, 0.5, ishift - 0.5, std::sin(ishift * 1.0 * spm.psiA));
+      registry.fill(HIST("shift/ShiftZDCA"), spm.centrality, 1.5, ishift - 0.5, std::cos(ishift * 1.0 * spm.psiA));
+    }
 
     if (cfg.cFillEventQA) {
       histos.fill(HIST("QA/hCentFull"), spm.centrality, 1);
     }
     if (cfg.cFillEventPlaneQA) {
-      histos.fill(HIST("QA/hSPplaneA"), spm.psiA, 1);
-      histos.fill(HIST("QA/hSPplaneC"), spm.psiC, 1);
+      histos.fill(HIST("QA/hSPplaneAC"), spm.psiA, spm.psiC, 1);
       histos.fill(HIST("QA/hSPplaneFull"), spm.psiFull, 1);
       histos.fill(HIST("QA/hCosPhiACosPhiC"), spm.centrality, std::cos(spm.psiA) * std::cos(spm.psiC));
       histos.fill(HIST("QA/hSinPhiASinPhiC"), spm.centrality, std::sin(spm.psiA) * std::sin(spm.psiC));
@@ -1499,7 +1505,7 @@ struct FlowSP {
     }
 
     // Always fill centrality histogram after event selections!
-    histos.fill(HIST("hCentralityCW"), spm.centrality);
+    histos.fill(HIST("hCentralityCW"), spm.centrality, spm.centWeight);
 
     fillEventQA<kAfter>(collision, tracks);
 

PWGCF/TwoParticleCorrelations/Tasks/cascDiHadronCorr.cxx

@@ -424,7 +424,11 @@ struct CascDiHadronCorr {
     same.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, userAxis));
     mixed.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, userAxis));
 
-    validCollisions.resize(registry.get<TH1>(HIST("Nch"))->GetNbinsX() * registry.get<TH1>(HIST("zVtx"))->GetNbinsX());
+    o2::framework::AxisSpec axisMult = axisMultiplicity;
+    o2::framework::AxisSpec axisVtx = axisVertex;
+    int nMultBins = axisMult.binEdges.size() - 1;
+    int nVtxBins = axisVtx.binEdges.size() - 1;
+    validCollisions.resize(nMultBins * nVtxBins);
 
     LOGF(info, "End of init");
   }
@@ -748,6 +752,8 @@ struct CascDiHadronCorr {
   {
     float triggerWeight = 1.0f;
     float associatedWeight = 1.0f;
+    if (currentCollision.assocParticles.size() == 0)
+      return;
     // loop over all  validCollisions in buffer
     for (const auto& collision : validCollisions[bin]) {
       double fSampleIndex = gRandom->Uniform(0, cfgSampleSize);
@@ -756,7 +762,7 @@ struct CascDiHadronCorr {
       if (mEfficiency) {
         efficiencyAssociatedCache.clear();
         efficiencyAssociatedCache.reserve(collision.assocParticles.size());
-        for (const auto& track2 : currentCollision.assocParticles) {
+        for (const auto& track2 : collision.assocParticles) {
           float weff = 1.;
           getEfficiencyCorrection(weff, track2.eta, track2.pt, posZ);
           efficiencyAssociatedCache.push_back(weff);
@@ -794,6 +800,8 @@ struct CascDiHadronCorr {
   {
     float triggerWeight = 1.0f;
     float associatedWeight = 1.0f;
+    if (currentCollision.assocParticles.size() == 0)
+      return;
     // loop over all  validCollisions in buffer
     for (const auto& collision : validCollisions[bin]) {
       double fSampleIndex = gRandom->Uniform(0, cfgSampleSize);
@@ -802,7 +810,7 @@ struct CascDiHadronCorr {
       if (mEfficiency) {
         efficiencyAssociatedCache.clear();
         efficiencyAssociatedCache.reserve(collision.assocParticles.size());
-        for (const auto& track2 : currentCollision.assocParticles) {
+        for (const auto& track2 : collision.assocParticles) {
           float weff = 1.;
           getEfficiencyCorrection(weff, track2.eta, track2.pt, posZ);
           efficiencyAssociatedCache.push_back(weff);
@@ -829,9 +837,9 @@ struct CascDiHadronCorr {
           float deltaEta = track1.eta() - track2.eta;
 
           if (cfgOutputXi)
-            same->getPairHist()->Fill(step, fSampleIndex, posZ, track1.pt(), track2.pt, deltaPhi, deltaEta, track1.mXi(), eventWeight * triggerWeight * associatedWeight);
+            mixed->getPairHist()->Fill(step, fSampleIndex, posZ, track1.pt(), track2.pt, deltaPhi, deltaEta, track1.mXi(), eventWeight * triggerWeight * associatedWeight);
           if (cfgOutputOmega)
-            same->getPairHist()->Fill(step, fSampleIndex, posZ, track1.pt(), track2.pt, deltaPhi, deltaEta, track1.mOmega(), eventWeight * triggerWeight * associatedWeight);
+            mixed->getPairHist()->Fill(step, fSampleIndex, posZ, track1.pt(), track2.pt, deltaPhi, deltaEta, track1.mOmega(), eventWeight * triggerWeight * associatedWeight);
           registry.fill(HIST("deltaEta_deltaPhi_mixed"), deltaPhi, deltaEta, eventWeight * triggerWeight * associatedWeight);
         }
       }
@@ -1592,7 +1600,7 @@ struct CascDiHadronCorr {
     }
   }
 
-  void processMCEfficiency(FilteredMcCollisions::iterator const& mcCollision, soa::SmallGroups<soa::Join<aod::McCollisionLabels, aod::Collisions>> const& collisions, soa::Join<aod::CascDatas, aod::McCascLabels> const& Cascades, FilteredMcParticles const& mcParticles)
+  void processMCEfficiency(FilteredMcCollisions::iterator const& mcCollision, soa::SmallGroups<soa::Join<aod::McCollisionLabels, aod::Collisions>> const& collisions, soa::Join<aod::CascDatas, aod::McCascLabels> const& Cascades, FilteredMcParticles const& mcParticles, DaughterTracks const&)
   {
     registry.fill(HIST("MCEffeventcount"), 0.5);
     if (cfgSelCollByNch && (mcParticles.size() < cfgCutMultMin || mcParticles.size() >= cfgCutMultMax)) {
@@ -1601,8 +1609,10 @@ struct CascDiHadronCorr {
     // Primaries
     for (const auto& mcParticle : mcParticles) {
       if (mcParticle.isPhysicalPrimary()) {
-        registry.fill(HIST("MCEffeventcount"), 1.5);
-        same->getTrackHistEfficiency()->Fill(CorrelationContainer::MC, mcParticle.eta(), mcParticle.pt(), getSpecies(mcParticle.pdgCode()), 0., mcCollision.posZ());
+        if ((cfgOutputXi && getSpecies(mcParticle.pdgCode()) == getSpecies(PDG_t::kXiMinus)) || (cfgOutputOmega && getSpecies(mcParticle.pdgCode()) == getSpecies(PDG_t::kOmegaMinus))) {
+          registry.fill(HIST("MCEffeventcount"), 1.5);
+          same->getTrackHistEfficiency()->Fill(CorrelationContainer::MC, mcParticle.eta(), mcParticle.pt(), getSpecies(mcParticle.pdgCode()), 0., mcCollision.posZ());
+        }
       }
     }
     for (const auto& collision : collisions) {
@@ -1613,14 +1623,16 @@ struct CascDiHadronCorr {
       }
 
       for (const auto& casc : groupedCascades) {
+        if (!cascSelected(casc, collision.posX(), collision.posY(), collision.posZ()))
+          continue;
         if (casc.has_mcParticle()) {
-          auto mcParticle = casc.mcParticle();
+          auto mcParticle = casc.mcParticle_as<FilteredMcParticles>();
           if (mcParticle.isPhysicalPrimary()) {
             registry.fill(HIST("MCEffeventcount"), 2.5);
             same->getTrackHistEfficiency()->Fill(CorrelationContainer::RecoPrimaries, mcParticle.eta(), mcParticle.pt(), getSpecies(mcParticle.pdgCode()), 0., mcCollision.posZ());
           }
           registry.fill(HIST("MCEffeventcount"), 3.5);
-          same->getTrackHistEfficiency()->Fill(CorrelationContainer::RecoAll, mcParticle.eta(), mcParticle.pt(), getSpecies(mcParticle.pdgCode()), 0., mcCollision.posZ());
+          same->getTrackHistEfficiency()->Fill(CorrelationContainer::RecoAll, mcParticle.eta(), mcParticle.pt(), (cfgOutputXi * getSpecies(PDG_t::kXiMinus) + cfgOutputOmega * getSpecies(PDG_t::kOmegaMinus)), 0., mcCollision.posZ());
         } else {
           // fake casc
           registry.fill(HIST("MCEffeventcount"), 4.5);

PWGDQ/Core/VarManager.cxx

@@ -916,6 +916,8 @@ void VarManager::SetDefaultVarNames()
   fgVariableUnits[kDCAzNPeaksTrimmed2] = "";
   fgVariableNames[kDCAzNPeaksTrimmed3] = "Number of peaks in binned DCAz distribution (trimmed 3)";
   fgVariableUnits[kDCAzNPeaksTrimmed3] = "";
+  fgVariableNames[kInteractionRate] = "Interaction rate";
+  fgVariableUnits[kInteractionRate] = "kHz";
   fgVariableNames[kPt] = "p_{T}";
   fgVariableUnits[kPt] = "GeV/c";
   fgVariableNames[kPt1] = "p_{T1}";
@@ -2196,6 +2198,7 @@ void VarManager::SetDefaultVarNames()
   fgVarNamesMap["kTwoR2EP1"] = kTwoR2EP1;
   fgVarNamesMap["kTwoR2EP2"] = kTwoR2EP2;
   fgVarNamesMap["kNPairsPerEvent"] = kNPairsPerEvent;
+  fgVarNamesMap["kInteractionRate"] = kInteractionRate;
   fgVarNamesMap["kNEventWiseVariables"] = kNEventWiseVariables;
   fgVarNamesMap["kX"] = kX;
   fgVarNamesMap["kY"] = kY;

PWGDQ/Core/VarManager.h

@@ -495,6 +495,7 @@ class VarManager : public TObject
     kTwoR2EP1,       // Event plane resolution of event2 for ME technique
     kTwoR2EP2,       // Event plane resolution of event2 for ME technique
     kNPairsPerEvent, // number of pairs per event in same-event or mixed-event pairing
+    kInteractionRate,
 
     // Variables for event mixing with cumulant
     kV22m,

PWGDQ/Tasks/tableReader_withAssoc.cxx

@@ -24,6 +24,7 @@
 #include "PWGDQ/DataModel/ReducedInfoTables.h"
 
 #include "Common/CCDB/EventSelectionParams.h"
+#include "Common/CCDB/ctpRateFetcher.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/TableHelper.h"
 
@@ -330,13 +331,16 @@ struct AnalysisEventSelection {
   Configurable<bool> fConfigRunZorro{"cfgRunZorro", false, "Enable event selection with zorro [WARNING: under debug, do not enable!]"};
   Configurable<std::string> fConfigCcdbUrl{"ccdb-url", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
   Configurable<int64_t> fConfigNoLaterThan{"ccdb-no-later-than", std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count(), "latest acceptable timestamp of creation for the object"};
+  Configurable<bool> fConfigFetchInteractionRate{"cfgFetchInteractionRate", false, "Fetch event-wise interaction rate from the CCDB"};
+  Configurable<std::string> fConfigIRSource{"cfgIRSource", "ZNC hadronic", "Estimator of the interaction rate (Recommended: pp --> T0VTX, Pb-Pb --> ZNC hadronic)"};
 
   HistogramManager* fHistMan = nullptr;
   MixingHandler* fMixHandler = nullptr;
   AnalysisCompositeCut* fEventCut = nullptr;
 
   Service<o2::ccdb::BasicCCDBManager> fCCDB{};
   o2::ccdb::CcdbApi fCCDBApi;
+  ctpRateFetcher rateFetcher;
 
   std::map<int64_t, bool> fSelMap;                     // key: reduced event global index, value: event selection decision
   std::map<uint64_t, std::vector<int64_t>> fBCCollMap; // key: global BC, value: vector of reduced event global indices
@@ -442,6 +446,10 @@ struct AnalysisEventSelection {
       // Reset the fValues array and fill event observables
       VarManager::ResetValues(0, VarManager::kNEventWiseVariables);
       VarManager::FillEvent<TEventFillMap>(event);
+      // Get the instantaneous IR from the CCDB
+      if (fConfigFetchInteractionRate.value) {
+        VarManager::fgValues[VarManager::kInteractionRate] = rateFetcher.fetch(fCCDB.service, event.timestamp(), fCurrentRun, fConfigIRSource.value, true) / 1000.; // kHz
+      }
 
       bool decision = false;
       // Fill histograms in the class Event, before cuts
@@ -3079,8 +3087,11 @@ struct AnalysisAsymmetricPairing {
   Configurable<bool> fConfigUseAbsDCA{"cfgUseAbsDCA", false, "Use absolute DCA minimization instead of chi^2 minimization in secondary vertexing"};
   Configurable<bool> fConfigPropToPCA{"cfgPropToPCA", false, "Propagate tracks to secondary vertex"};
   Configurable<std::string> fConfigLutPath{"lutPath", "GLO/Param/MatLUT", "Path of the Lut parametrization"};
+  Configurable<bool> fConfigFetchInteractionRate{"cfgFetchInteractionRate", false, "Fetch event-wise interaction rate from the CCDB"};
+  Configurable<std::string> fConfigIRSource{"cfgIRSource", "ZNC hadronic", "Estimator of the interaction rate (Recommended: pp --> T0VTX, Pb-Pb --> ZNC hadronic)"};
 
   Service<o2::ccdb::BasicCCDBManager> fCCDB{};
+  ctpRateFetcher rateFetcher;
 
   HistogramManager* fHistMan = nullptr;
 
@@ -3420,6 +3431,10 @@ struct AnalysisAsymmetricPairing {
       // Reset the fValues array
       VarManager::ResetValues(0, VarManager::kNVars);
       VarManager::FillEvent<TEventFillMap>(event, dqtablereader_helpers::varValues());
+      // Get the instantaneous IR from the CCDB
+      if (fConfigFetchInteractionRate.value) {
+        VarManager::fgValues[VarManager::kInteractionRate] = rateFetcher.fetch(fCCDB.service, event.timestamp(), fCurrentRun, fConfigIRSource.value, true) / 1000.; // kHz
+      }
 
       auto groupedLegAAssocs = legACandidateAssocs.sliceBy(preslice, event.globalIndex());
       if (groupedLegAAssocs.size() == 0) {