Merge branch 'AliceO2Group:master' into master

Author: nkaratze

ALICE3/TableProducer/OTF/onTheFlyTracker.cxx

@@ -200,6 +200,13 @@ struct Alice3MulticharmFinder {
     int nTPCHitsPiCC;
   } thisXiCCcandidate;
 
+  struct ProngInfo {
+    float pt = 1e+10;
+    float eta = 1e+10;
+    float dcaXY = 1e+10;
+    float dcaZ = 1e+10;
+  };
+
   template <typename TTrackType>
   bool buildDecayCandidateTwoBody(TTrackType const& t0, TTrackType const& t1, float mass0, float mass1)
   {
@@ -557,10 +564,6 @@ struct Alice3MulticharmFinder {
       }
 
       uint32_t nCombinationsC = 0;
-      auto bach = xiCand.bachTrack_as<Alice3Tracks>(); // de-reference bach track
-      auto neg = xiCand.negTrack_as<Alice3Tracks>();   // de-reference neg track
-      auto pos = xiCand.posTrack_as<Alice3Tracks>();   // de-reference pos track
-
       if (!BIT_CHECK(xi.decayMap(), kTrueXiFromXiC)) {
         continue;
       }
@@ -822,13 +825,38 @@ struct Alice3MulticharmFinder {
                 picc.hasSigPi(), picc.nSigmaPionRich(),
                 getPdgCodeForTrack(picc));
 
+              ProngInfo bachelor, positive, negative;
+              if (xiCand.has_bachTrack()) {
+                auto bach = xiCand.bachTrack_as<Alice3Tracks>(); // de-reference bach track
+                bachelor.pt = bach.pt();
+                bachelor.eta = bach.eta();
+                bachelor.dcaXY = bach.dcaXY();
+                bachelor.dcaZ = bach.dcaZ();
+              }
+
+              if (xiCand.has_negTrack()) {
+                auto neg = xiCand.negTrack_as<Alice3Tracks>(); // de-reference neg track
+                negative.pt = neg.pt();
+                negative.eta = neg.eta();
+                negative.dcaXY = neg.dcaXY();
+                negative.dcaZ = neg.dcaZ();
+              }
+
+              if (xiCand.has_posTrack()) {
+                auto pos = xiCand.posTrack_as<Alice3Tracks>(); // de-reference pos track
+                positive.pt = pos.pt();
+                positive.eta = pos.eta();
+                positive.dcaXY = pos.dcaXY();
+                positive.dcaZ = pos.dcaZ();
+              }
+
               multiCharmExtra(
-                bach.pt(), bach.eta(),
-                bach.dcaXY(), bach.dcaZ(),
-                pos.pt(), pos.eta(),
-                pos.dcaXY(), pos.dcaZ(),
-                neg.pt(), neg.eta(),
-                neg.dcaXY(), neg.dcaZ(),
+                bachelor.pt, bachelor.eta,
+                bachelor.dcaXY, bachelor.dcaZ,
+                positive.pt, positive.eta,
+                positive.dcaXY, positive.dcaZ,
+                negative.pt, negative.eta,
+                negative.dcaXY, negative.dcaZ,
                 pi1c.eta(), pi2c.eta(), picc.eta());
             }
           }

ALICE3/TableProducer/alice3MulticharmFinder.cxx

@@ -33,6 +33,7 @@
 #include <TFitResultPtr.h>
 #include <TH1.h>
 #include <TH2.h>
+#include <TH3.h>
 #include <TMath.h>
 #include <TMathBase.h>
 #include <TNamed.h>
@@ -383,7 +384,7 @@ Double_t multGlauberNBDFitter::ContinuousNBD(Double_t n, Double_t mu, Double_t k
   return F;
 }
 
-void multGlauberNBDFitter::CalculateAvNpNc(TProfile* lNPartProf, TProfile* lNCollProf, TH2F* lNPart2DPlot, TH2F* lNColl2DPlot, TH1F* hPercentileMap, Double_t lLoRange, Double_t lHiRange)
+void multGlauberNBDFitter::CalculateAvNpNc(TProfile* lNPartProf, TProfile* lNCollProf, TH2F* lNPart2DPlot, TH2F* lNColl2DPlot, TH1F* hPercentileMap, Double_t lLoRange, Double_t lHiRange, TH3D* lNpNcEcc, TH2F* lEcc2DPlot)
 {
   cout << "Calculating <Npart>, <Ncoll> in centrality bins..." << endl;
   cout << "Range to calculate: " << lLoRange << " to " << lHiRange << endl;
@@ -419,6 +420,17 @@ void multGlauberNBDFitter::CalculateAvNpNc(TProfile* lNPartProf, TProfile* lNCol
     Double_t lNAncestors0 = (Int_t)(fNpart[ibin] * ff + fNcoll[ibin] * (1.0 - ff));
     Double_t lNAncestors1 = TMath::Floor(fNpart[ibin] * ff + fNcoll[ibin] * (1.0 - ff) + 0.5);
     Double_t lNAncestors2 = (fNpart[ibin] * ff + fNcoll[ibin] * (1.0 - ff));
+
+    TH1D* hEccentricity = 0x0;
+
+    if (lNpNcEcc) {
+      // locate the histogram that corresponds to the eccentricity distribution in this NpNc pair
+      lNpNcEcc->GetXaxis()->SetRange(lNpNcEcc->GetXaxis()->FindBin(fNpart[ibin]), lNpNcEcc->GetXaxis()->FindBin(fNpart[ibin]));
+      lNpNcEcc->GetYaxis()->SetRange(lNpNcEcc->GetYaxis()->FindBin(fNcoll[ibin]), lNpNcEcc->GetYaxis()->FindBin(fNcoll[ibin]));
+      hEccentricity = reinterpret_cast<TH1D*>(lNpNcEcc->Project3D("z"));
+      hEccentricity->SetName(Form("hEccentricity_%i", ibin));
+    }
+
     for (Long_t lMultValue = 1; lMultValue < lHiRange; lMultValue++) {
       Double_t lNancestors = lNAncestors0;
       if (fAncestorMode == 1)
@@ -444,6 +456,12 @@ void multGlauberNBDFitter::CalculateAvNpNc(TProfile* lNPartProf, TProfile* lNCol
         lNPart2DPlot->Fill(lMultValueToFill, fNpart[ibin], lProbability);
       if (lNColl2DPlot)
         lNColl2DPlot->Fill(lMultValueToFill, fNcoll[ibin], lProbability);
+      if (lNpNcEcc) {
+        // collapse the entire eccentricity distribution for this combo
+        for (int ib = 1; ib < hEccentricity->GetNbinsX() + 1; ib++) {
+          lEcc2DPlot->Fill(lMultValueToFill, hEccentricity->GetBinCenter(ib), lProbability * hEccentricity->GetBinContent(ib));
+        }
+      }
     }
   }
 }

ALICE3/Tasks/alice3-lutmaker.cxx

@@ -15,6 +15,7 @@
 #include <TF1.h>
 #include <TH1.h>
 #include <TH2.h>
+#include <TH3.h>
 #include <TNamed.h>
 #include <TProfile.h>
 #include <TString.h>
@@ -77,7 +78,7 @@ class multGlauberNBDFitter : public TNamed
   Double_t ContinuousNBD(Double_t n, Double_t mu, Double_t k);
 
   // For estimating Npart, Ncoll in multiplicity bins
-  void CalculateAvNpNc(TProfile* lNPartProf, TProfile* lNCollProf, TH2F* lNPart2DPlot, TH2F* lNColl2DPlot, TH1F* hPercentileMap, Double_t lLoRange = -1, Double_t lHiRange = -1);
+  void CalculateAvNpNc(TProfile* lNPartProf, TProfile* lNCollProf, TH2F* lNPart2DPlot, TH2F* lNColl2DPlot, TH1F* hPercentileMap, Double_t lLoRange = -1, Double_t lHiRange = -1, TH3D* lNpNcEcc = 0x0, TH2F* lEcc2DPlot = 0x0);
 
   // void    Print(Option_t *option="") const;