Merge remote-tracking branch 'refs/remotes/upstream/master'

Author: MattOckleton

DPG/Tasks/TPC/tpcSkimsTableCreator.cxx

@@ -42,6 +42,8 @@
 #include <Framework/AnalysisHelpers.h>
 #include <Framework/AnalysisTask.h>
 #include <Framework/Configurable.h>
+#include <Framework/HistogramRegistry.h>
+#include <Framework/HistogramSpec.h>
 #include <Framework/InitContext.h>
 #include <Framework/runDataProcessing.h>
 #include <ReconstructionDataFormats/PID.h>
@@ -101,6 +103,10 @@ struct TreeWriterTpcV0 {
   Configurable<float> maxPt4dwnsmplTsalisProtons{"maxPt4dwnsmplTsalisProtons", 100., "Maximum Pt for applying downsampling factor of protons"};
   Configurable<float> maxPt4dwnsmplTsalisElectrons{"maxPt4dwnsmplTsalisElectrons", 100., "Maximum Pt for applying  downsampling factor of electrons"};
   Configurable<float> maxPt4dwnsmplTsalisKaons{"maxPt4dwnsmplTsalisKaons", 100., "Maximum Pt for applying  downsampling factor of kaons"};
+  // Configurables for output tables reservation size
+  Configurable<float> reserveV0Ratio{"reserveV0Ratio", 0.05, "Ratio of how many tracks from V0s are expected in the output table to the input V0 table size"};
+  Configurable<float> reserveCascRatio{"reserveCascRatio", 0.0025, "Ratio of how many tracks from cascades are expected in the output table to the input Cascade table size"};
+  Configurable<bool> saveReserveQaHisto{"saveReserveQaHisto", true, "Flag to save the DF-wise ratio of output table size to that of input table"};
   // Configurables for run condtion table
   Configurable<std::string> rctLabel{"rctLabel", "CBT_hadronPID", "select 1 [CBT, CBT_hadronPID, CBT_muon_glo] see O2Physics/Common/CCDB/RCTSelectionFlags.h"};
   Configurable<bool> checkZdc{"checkZdc", false, "set ZDC flag for PbPb"};
@@ -109,6 +115,8 @@ struct TreeWriterTpcV0 {
   // Configurable for the path of CCDB General Run Parameters LHC Interface information
   Configurable<std::string> ccdbPathGrpLhcIf{"ccdbPathGrpLhcIf", "GLO/Config/GRPLHCIF", "Path on the CCDB for the GRPLHCIF object"};
 
+  HistogramRegistry registry{"registry", {}};
+
   // an arbitrary value of N sigma TOF assigned by TOF task to tracks which are not matched to TOF hits
   constexpr static float NSigmaTofUnmatched{o2::aod::v0data::kNoTOFValue};
   const float nSigmaTofUnmatchedEqualityTolerance{std::fabs(NSigmaTofUnmatched) / 1e4f};
@@ -182,6 +190,11 @@ struct TreeWriterTpcV0 {
     ccdb->setFatalWhenNull(false);
 
     rctChecker.init(rctLabel, checkZdc, treatLimitedAcceptanceAsBad);
+
+    if (saveReserveQaHisto) {
+      registry.add("hV0OutputRatio", "V0 out/in ratio;V0 out/in ratio;Entries", {HistType::kTH1F, {{100, 0, reserveV0Ratio}}});
+      registry.add("hCascOutputRatio", "Casc out/in ratio;Casc out/in ratio;Entries", {HistType::kTH1F, {{100, 0, reserveCascRatio}}});
+    }
   }
 
   template <bool IsCorrectedDeDx, typename V0Casc, typename T>
@@ -422,6 +435,16 @@ struct TreeWriterTpcV0 {
                                               aod::pidits::ITSNSigmaEl, aod::pidits::ITSNSigmaPi,
                                               aod::pidits::ITSNSigmaKa, aod::pidits::ITSNSigmaPr>(myTracks);
 
+    int nV0Entries{0};
+    int nCascEntries{0};
+
+    const int64_t expectedOutputTableSize = static_cast<int64_t>(reserveV0Ratio * myV0s.size() + reserveCascRatio * myCascs.size());
+    if constexpr (ModeId == ModeWithdEdxTrkQA || ModeId == ModeStandard) {
+      rowTPCTree.reserve(expectedOutputTableSize);
+    } else {
+      rowTPCTreeWithTrkQA.reserve(expectedOutputTableSize);
+    }
+
     std::string irSource{};
     float sqrtSNN{};
     bool isFirstCollision{true};
@@ -448,11 +471,9 @@ struct TreeWriterTpcV0 {
       if constexpr (ModeId == ModeWithdEdxTrkQA || ModeId == ModeStandard) {
         bcTimeFrameId = UndefValueInt;
         bcBcInTimeFrame = UndefValueInt;
-        rowTPCTree.reserve(2 * v0s.size() + cascs.size());
       } else if constexpr (ModeId == ModeWithTrkQA) {
         bcTimeFrameId = bc.tfId();
         bcBcInTimeFrame = bc.bcInTF();
-        rowTPCTreeWithTrkQA.reserve(2 * v0s.size() + cascs.size());
       }
 
       auto getTrackQA = [&](const TrksType::iterator& track) {
@@ -488,7 +509,9 @@ struct TreeWriterTpcV0 {
             evaluateOccupancyVariables(dauTrack, occValues);
           }
           fillSkimmedV0Table<IsCorrectedDeDx, ModeId>(mother, dauTrack, trackQAInstance, existTrkQA, collision, daughter.tpcNSigma, daughter.tofNSigma, daughter.itsNSigma, daughter.tpcExpSignal, daughter.id, runnumber, daughter.dwnSmplFactor, hadronicRate, bcGlobalIndex, bcTimeFrameId, bcBcInTimeFrame, occValues, isGoodRctEvent);
+          return true;
         }
+        return false;
       };
 
       /// Loop over v0 candidates
@@ -500,8 +523,12 @@ struct TreeWriterTpcV0 {
         const auto posTrack = v0.posTrack_as<TrksType>();
         const auto negTrack = v0.negTrack_as<TrksType>();
 
-        fillDaughterTrack(v0, posTrack, v0, true);
-        fillDaughterTrack(v0, negTrack, v0, false);
+        if (fillDaughterTrack(v0, posTrack, v0, true)) {
+          ++nV0Entries;
+        }
+        if (fillDaughterTrack(v0, negTrack, v0, false)) {
+          ++nV0Entries;
+        }
       }
 
       /// Loop over cascade candidates
@@ -513,9 +540,23 @@ struct TreeWriterTpcV0 {
         const auto bachTrack = casc.bachelor_as<TrksType>();
         // Omega and antiomega
         const auto isDaughterPositive = cascId == MotherAntiOmega ? true : false;
-        fillDaughterTrack(casc, bachTrack, casc, isDaughterPositive);
+        if (fillDaughterTrack(casc, bachTrack, casc, isDaughterPositive)) {
+          ++nCascEntries;
+        }
       }
     }
+    LOG(info) << "runV0() summary:";
+    LOG(info) << "V0 table size = " << myV0s.size();
+    LOG(info) << "Cascade table size = " << myCascs.size();
+    LOG(info) << "nV0Entries = " << nV0Entries;
+    LOG(info) << "nCascEntries = " << nCascEntries;
+    LOG(info) << "nV0Entries / V0 table size = " << static_cast<double>(nV0Entries) / myV0s.size();
+    LOG(info) << "nCascEntries / Cascade table size = " << static_cast<double>(nCascEntries) / myCascs.size();
+
+    if (saveReserveQaHisto) {
+      registry.fill(HIST("hV0OutputRatio"), static_cast<double>(nV0Entries) / myV0s.size());
+      registry.fill(HIST("hCascOutputRatio"), static_cast<double>(nCascEntries) / myCascs.size());
+    }
   } /// runV0
 
   void processStandard(Colls const& collisions,
@@ -637,6 +678,9 @@ struct TreeWriterTpcTof {
   Configurable<float> downsamplingTsalisProtons{"downsamplingTsalisProtons", -1., "Downsampling factor to reduce the number of protons"};
   Configurable<float> downsamplingTsalisKaons{"downsamplingTsalisKaons", -1., "Downsampling factor to reduce the number of kaons"};
   Configurable<float> downsamplingTsalisPions{"downsamplingTsalisPions", -1., "Downsampling factor to reduce the number of pions"};
+  // Configurable for output table reservation size
+  Configurable<float> reserveTrackRatio{"reserveTrackRatio", 0.003, "Ratio of how many tracks are expected in the output table to the input Tracks table size"};
+  Configurable<bool> saveReserveQaHisto{"saveReserveQaHisto", true, "Flag to save the DF-wise ratio of output table size to that of input table"};
   // Configurables for run condtion table
   Configurable<std::string> rctLabel{"rctLabel", "CBT_hadronPID", "select 1 [CBT, CBT_hadronPID, CBT_muon_glo] see O2Physics/Common/CCDB/RCTSelectionFlags.h"};
   Configurable<bool> checkZdc{"checkZdc", false, "set ZDC flag for PbPb"};
@@ -645,6 +689,8 @@ struct TreeWriterTpcTof {
   // Configurable for the path of CCDB General Run Parameters LHC Interface information
   Configurable<std::string> ccdbPathGrpLhcIf{"ccdbPathGrpLhcIf", "GLO/Config/GRPLHCIF", "Path on the CCDB for the GRPLHCIF object"};
 
+  HistogramRegistry registry{"registry", {}};
+
   struct TofTrack {
     bool isApplyHardCutOnly;
     double maxMomHardCutOnly;
@@ -699,6 +745,10 @@ struct TreeWriterTpcTof {
     ccdb->setFatalWhenNull(false);
 
     rctChecker.init(rctLabel, checkZdc, treatLimitedAcceptanceAsBad);
+
+    if (saveReserveQaHisto) {
+      registry.add("hTrackOutputRatio", "Track out/in ratio;Track out/in ratio;Entries", {HistType::kTH1F, {{100, 0, reserveTrackRatio}}});
+    }
   }
 
   template <bool DoCorrectDeDx, int ModeId, typename T, typename C>
@@ -810,6 +860,14 @@ struct TreeWriterTpcTof {
         labelTrack2TrackQA.at(trackId) = trackQA.globalIndex();
       }
     }
+
+    const int64_t expectedOutputTableSize = static_cast<int64_t>(reserveTrackRatio * myTracks.size());
+    if constexpr (ModeId == ModeWithdEdxTrkQA || ModeId == ModeStandard) {
+      rowTPCTOFTree.reserve(expectedOutputTableSize);
+    } else {
+      rowTPCTOFTreeWithTrkQA.reserve(expectedOutputTableSize);
+    }
+
     std::string irSource{};
     float sqrtSNN{};
     bool isFirstCollision{true};
@@ -843,11 +901,9 @@ struct TreeWriterTpcTof {
       if constexpr (ModeId == ModeStandard || ModeId == ModeWithdEdxTrkQA) {
         bcTimeFrameId = UndefValueInt;
         bcBcInTimeFrame = UndefValueInt;
-        rowTPCTOFTree.reserve(tracks.size());
       } else {
         bcTimeFrameId = bc.tfId();
         bcBcInTimeFrame = bc.bcInTF();
-        rowTPCTOFTreeWithTrkQA.reserve(tracks.size());
       }
       for (auto const& trk : tracksWithITSPid) {
         if (!isTrackSelected(trk, trackSelection)) {
@@ -889,6 +945,14 @@ struct TreeWriterTpcTof {
         }
       } /// Loop tracks
     }
+    LOG(info) << "runTof() summary:";
+    LOG(info) << "Track table size = " << myTracks.size();
+    LOG(info) << "nTrackEntries = " << rowTPCTOFTree.lastIndex() + 1;
+    LOG(info) << "nTrackEntries / Track table size = " << static_cast<double>((rowTPCTOFTree.lastIndex() + 1)) / myTracks.size();
+
+    if (saveReserveQaHisto) {
+      registry.fill(HIST("hTrackOutputRatio"), static_cast<double>((rowTPCTOFTree.lastIndex() + 1)) / myTracks.size());
+    }
   } /// runTof
 
   void processStandard(Colls const& collisions,

PWGCF/EbyEFluctuations/Tasks/v0ptHadPiKaProt.cxx

@@ -379,6 +379,11 @@ struct V0ptHadPiKaProt {
     histos.add("h2DnsigmaPionTofVsPtAfterCut", "2D hist of nSigmaTOF vs. pT (pion)", kTH2F, {ptAxis, nSigmaAxis});
     histos.add("h2DnsigmaKaonTofVsPtAfterCut", "2D hist of nSigmaTOF vs. pT (kaon)", kTH2F, {ptAxis, nSigmaAxis});
     histos.add("h2DnsigmaProtonTofVsPtAfterCut", "2D hist of nSigmaTOF vs. pT (proton)", kTH2F, {ptAxis, nSigmaAxis});
+
+    histos.add("h2DnsigmaPionTpcVsTofInterimCut", "3D hist of nSigmaTPC vs. nSigmaTOF (pion)", kTH3F, {ptAxis, nSigmaAxis, nSigmaAxis});
+    histos.add("h2DnsigmaKaonTpcVsTofInterimCut", "3D hist of nSigmaTPC vs. nSigmaTOF (kaon)", kTH3F, {ptAxis, nSigmaAxis, nSigmaAxis});
+    histos.add("h2DnsigmaProtonTpcVsTofInterimCut", "3D hist of nSigmaTPC vs. nSigmaTOF (proton)", kTH3F, {ptAxis, nSigmaAxis, nSigmaAxis});
+
     histos.add("h2DnsigmaPionTpcVsTofAfterCut", "3D hist of nSigmaTPC vs. nSigmaTOF (pion)", kTH3F, {ptAxis, nSigmaAxis, nSigmaAxis});
     histos.add("h2DnsigmaKaonTpcVsTofAfterCut", "3D hist of nSigmaTPC vs. nSigmaTOF (kaon)", kTH3F, {ptAxis, nSigmaAxis, nSigmaAxis});
     histos.add("h2DnsigmaProtonTpcVsTofAfterCut", "3D hist of nSigmaTPC vs. nSigmaTOF (proton)", kTH3F, {ptAxis, nSigmaAxis, nSigmaAxis});
@@ -782,20 +787,11 @@ struct V0ptHadPiKaProt {
     }
 
     if (candidate.pt() > cfgCutPtLower && candidate.pt() <= cfgCutPtUpperTPC) {
-      int flagg1 = 0;
-      if (candidate.tpcNSigmaPi() < cfgnSigmaOtherParticles)
-        flagg1 += 1;
-      if (candidate.tpcNSigmaKa() < cfgnSigmaOtherParticles)
-        flagg1 += 1;
-      if (candidate.tpcNSigmaPr() < cfgnSigmaOtherParticles)
-        flagg1 += 1;
-      if (candidate.tpcNSigmaEl() < cfgnSigmaOtherParticles)
-        flagg1 += 1;
-
-      if (!(flagg1 > 1) && !candidate.hasTOF() && std::abs(partNsigmaTpcOrItsPr) < cfgnSigmaCutTPC) {
+
+      if (!candidate.hasTOF() && std::abs(partNsigmaTpcOrItsPr) < cfgnSigmaCutTPC) {
         flag = 1;
       }
-      if (!(flagg1 > 1) && candidate.hasTOF() && std::abs(partNsigmaTpcOrItsPr) < cfgnSigmaCutTPC && std::abs(candidate.tofNSigmaPr()) < cfgnSigmaCutTOF) {
+      if (candidate.hasTOF() && std::abs(partNsigmaTpcOrItsPr) < cfgnSigmaCutTPC && std::abs(candidate.tofNSigmaPr()) < cfgnSigmaCutTOF) {
         flag = 1;
       }
     }
@@ -826,6 +822,8 @@ struct V0ptHadPiKaProt {
         }
 
         if (!(flag2 > 1) && passDominance) {
+          histos.fill(HIST("h2DnsigmaKaonTpcVsTofInterimCut"), candidate.pt(), candidate.tpcNSigmaPr(), candidate.tofNSigmaPr());
+
           if (combNSigmaPr < cfgnSigmaCutCombTPCTOF) {
             flag = 1;
           }
@@ -860,20 +858,10 @@ struct V0ptHadPiKaProt {
 
     if (candidate.pt() > cfgCutPtLower && candidate.pt() <= cfgCutPtUpperTPC) {
 
-      int flagg1 = 0;
-      if (candidate.tpcNSigmaPi() < cfgnSigmaOtherParticles)
-        flagg1 += 1;
-      if (candidate.tpcNSigmaKa() < cfgnSigmaOtherParticles)
-        flagg1 += 1;
-      if (candidate.tpcNSigmaPr() < cfgnSigmaOtherParticles)
-        flagg1 += 1;
-      if (candidate.tpcNSigmaEl() < cfgnSigmaOtherParticles)
-        flagg1 += 1;
-
-      if (!(flagg1 > 1) && !candidate.hasTOF() && std::abs(partNsigmaTpcOrItsPi) < cfgnSigmaCutTPC) {
+      if (!candidate.hasTOF() && std::abs(partNsigmaTpcOrItsPi) < cfgnSigmaCutTPC) {
         flag = 1;
       }
-      if (!(flagg1 > 1) && candidate.hasTOF() && std::abs(partNsigmaTpcOrItsPi) < cfgnSigmaCutTPC && std::abs(candidate.tofNSigmaPi()) < cfgnSigmaCutTOF) {
+      if (candidate.hasTOF() && std::abs(partNsigmaTpcOrItsPi) < cfgnSigmaCutTPC && std::abs(candidate.tofNSigmaPi()) < cfgnSigmaCutTOF) {
         flag = 1;
       }
     }
@@ -904,6 +892,7 @@ struct V0ptHadPiKaProt {
         }
 
         if (!(flag2 > 1) && passDominance) {
+          histos.fill(HIST("h2DnsigmaKaonTpcVsTofInterimCut"), candidate.pt(), candidate.tpcNSigmaPi(), candidate.tofNSigmaPi());
           if (combNSigmaPi < cfgnSigmaCutCombTPCTOF) {
             flag = 1;
           }
@@ -938,20 +927,10 @@ struct V0ptHadPiKaProt {
 
     if (candidate.pt() > cfgCutPtLower && candidate.pt() <= cfgCutPtUpperTPC) {
 
-      int flagg1 = 0;
-      if (candidate.tpcNSigmaPi() < cfgnSigmaOtherParticles)
-        flagg1 += 1;
-      if (candidate.tpcNSigmaKa() < cfgnSigmaOtherParticles)
-        flagg1 += 1;
-      if (candidate.tpcNSigmaPr() < cfgnSigmaOtherParticles)
-        flagg1 += 1;
-      if (candidate.tpcNSigmaEl() < cfgnSigmaOtherParticles)
-        flagg1 += 1;
-
-      if (!(flagg1 > 1) && !candidate.hasTOF() && std::abs(partNsigmaTpcOrItsKa) < cfgnSigmaCutTPC) {
+      if (!candidate.hasTOF() && std::abs(partNsigmaTpcOrItsKa) < cfgnSigmaCutTPC) {
         flag = 1;
       }
-      if (!(flagg1 > 1) && candidate.hasTOF() && std::abs(partNsigmaTpcOrItsKa) < cfgnSigmaCutTPC && std::abs(candidate.tofNSigmaKa()) < cfgnSigmaCutTOF) {
+      if (candidate.hasTOF() && std::abs(partNsigmaTpcOrItsKa) < cfgnSigmaCutTPC && std::abs(candidate.tofNSigmaKa()) < cfgnSigmaCutTOF) {
         flag = 1;
       }
     }
@@ -982,6 +961,7 @@ struct V0ptHadPiKaProt {
         }
 
         if (!(flag2 > 1) && passDominance) {
+          histos.fill(HIST("h2DnsigmaKaonTpcVsTofInterimCut"), candidate.pt(), candidate.tpcNSigmaKa(), candidate.tofNSigmaKa());
           if (combNSigmaKa < cfgnSigmaCutCombTPCTOF) {
             flag = 1;
           }

PWGCF/MultiparticleCorrelations/Tasks/multiharmonicCorrelations.cxx

@@ -26,6 +26,7 @@
 
 #include <TCollection.h>
 #include <TComplex.h>
+#include <TF1.h>
 #include <TFile.h>
 #include <TGrid.h>
 #include <TH1.h>
@@ -114,6 +115,7 @@ struct MultiharmonicCorrelations { // this name is used in lower-case format to
   Configurable<bool> cfQA{"cfQA", true, "quality assurance"};
   Configurable<bool> cfInitsim{"cfInitsim", false, "init histograms of sim"};
   Configurable<bool> cfUseWeights{"cfUseWeights", true, "use weights"};
+  Configurable<bool> cfToyModel{"cfToyModel", true, "phi-distribution from toy model"};
 
   Configurable<std::vector<float>> cfVertexZ{"cfVertexZ", {-10, 10.}, "vertex z position range: {min, max}[cm], with convention: min <= Vz < max"};
   Configurable<std::vector<float>> cfPt{"cfPt", {0.2, 5.0}, "transverse momentum range"};
@@ -399,6 +401,16 @@ struct MultiharmonicCorrelations { // this name is used in lower-case format to
     return four;
   } // TComplex Four(Int_t n1, Int_t n2, Int_t n3, Int_t n4)
 
+  static double pdf(double* x, double* par)
+  {
+    double y = 1;
+    int harm = 6;
+    for (int i = 0; i < harm; i = i + 1) {
+      y = y + 2 * (0.04 + (i + 1.) * 0.01) * TMath::Cos((i + 1) * (x[0] - par[0]));
+    }
+    return y;
+  }
+
   template <eRecSim rs, typename T1, typename T2>
   void Steer(T1 const& collision, T2 const& tracks)
   {
@@ -412,6 +424,8 @@ struct MultiharmonicCorrelations { // this name is used in lower-case format to
     auto it = phih.histMap.find(currentRun);
     auto histweight = wh.weightsmap.find(currentRun);
     float centr = 0, M = 0., msel = 0.;
+    TF1* f = new TF1("f", pdf, 0, TMath::TwoPi(), 1);
+    f->SetParameters(0.);
 
     if constexpr (rs == eRec || rs == eRecAndSim) {
       if (cfCent.value == "FT0C")
@@ -511,6 +525,9 @@ struct MultiharmonicCorrelations { // this name is used in lower-case format to
         event.fEventHistograms[ePt][eRec][1]->Fill(ptrec);
 
         phi = track.phi();
+        if (cfToyModel) {
+          phi = f->GetRandom();
+        }
         if (it != phih.histMap.end()) {
           it->second->Fill(phi);
         }
@@ -674,8 +691,8 @@ struct MultiharmonicCorrelations { // this name is used in lower-case format to
     float maxdcaxy = l_dcaxy_bins[2];
     float mindcaz = l_dcaz_bins[1];
     float maxdcaz = l_dcaz_bins[2];
-    float maxncontr = l_ncontr_bins[1];
-    float minncontr = l_ncontr_bins[2];
+    float minncontr = l_ncontr_bins[1];
+    float maxncontr = l_ncontr_bins[2];
 
     const char* cevent[] = {"vertexZ", "Pt"};
     const char* cpro[] = {"rec", "sim"};