Merge branch 'AliceO2Group:master' into modified

Author: sjzhu0v0

Common/TableProducer/caloClusterProducer.cxx

@@ -1728,14 +1728,14 @@ struct CaloClusterProducer {
       case 0:
         return en;
       case 1: { // Data Run3
-        const double a = 9.3494e-01;
-        const double b = 1.00526e-02;
-        const double c = 8.45164e-02;
-        const double d = -1.03364e-02;
-        const double f = 5.4803e-03;
-        const double g = 0.779983;
-        const double h = 0.622282;
-        const double k = 8.0182e-05;
+        const double a = 0.892787;
+        const double b = 0.004053;
+        const double c = 0.074652;
+        const double d = -0.016306;
+        const double f = 7.616314;
+        const double g = -104.409;
+        const double h = 1837.17;
+        const double k = 0.000091;
         double eMin = std::max(static_cast<float>(0.1), en); // Parameterization valid down to 100 MeV
         return en * (a + b * eMin + c / eMin + d / (eMin * eMin) + f / ((eMin - g) * (eMin - g) + h * h) + k / std::pow(eMin, 4));
       }

Common/Tools/Multiplicity/multGlauberNBDFitter.cxx

@@ -309,6 +309,7 @@ Bool_t multGlauberNBDFitter::DoFit()
   fk = fGlauberNBD->GetParameter(1);
   ff = fGlauberNBD->GetParameter(2);
   fnorm = fGlauberNBD->GetParameter(3);
+  fdMu = fGlauberNBD->GetParameter(4);
 
   return fitptr.Get()->IsValid();
 }
@@ -369,18 +370,35 @@ 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)
+void multGlauberNBDFitter::CalculateAvNpNc(TProfile* lNPartProf, TProfile* lNCollProf, TH2F* lNPart2DPlot, TH2F* lNColl2DPlot, TH1F* hPercentileMap, Double_t lLoRange, Double_t lHiRange)
 {
   cout << "Calculating <Npart>, <Ncoll> in centrality bins..." << endl;
+  cout << "Range to calculate: " << lLoRange << " to " << lHiRange << endl;
+
+  cout << "Acquiring values from the fit function..." << endl;
+
+  fMu = fGlauberNBD->GetParameter(0);
+  fk = fGlauberNBD->GetParameter(1);
+  ff = fGlauberNBD->GetParameter(2);
+  fnorm = fGlauberNBD->GetParameter(3);
+  fdMu = fGlauberNBD->GetParameter(4);
+
+  cout << "Please inspect now: " << endl;
+  cout << "Glauber NBD mu ............: " << fMu << endl;
+  cout << "Glauber NBD k .............: " << fk << endl;
+  cout << "Glauber NBD f .............: " << ff << endl;
+  cout << "Glauber NBD norm ..........: " << fnorm << endl;
+  cout << "Glauber NBD dmu/dNanc .....: " << fdMu << endl;
 
   //2-fold nested loop:
   // + looping over all Nancestor combinations
   // + looping over all possible final multiplicities
   // ^---> final product already multiplicity-binned
 
   //______________________________________________________
-  Double_t lLoRange, lHiRange;
-  fGlauberNBD->GetRange(lLoRange, lHiRange);
+  if (lLoRange < -1 && lHiRange < -1) {
+    fGlauberNBD->GetRange(lLoRange, lHiRange);
+  }
   // bypass to zero
   for (int ibin = 0; ibin < fNNpNcPairs; ibin++) {
     if (ibin % 2000 == 0)

Common/Tools/Multiplicity/multGlauberNBDFitter.h

@@ -75,7 +75,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);
+  void CalculateAvNpNc(TProfile* lNPartProf, TProfile* lNCollProf, TH2F* lNPart2DPlot, TH2F* lNColl2DPlot, TH1F* hPercentileMap, Double_t lLoRange = -1, Double_t lHiRange = -1);
 
   //void    Print(Option_t *option="") const;
 

Common/Tools/TrackTuner.h

@@ -722,7 +722,7 @@ struct TrackTuner : o2::framework::ConfigurableGroup {
       double deltaDcaXYmean = dcaXYMeanData - dcaXYMeanMC;
 
       // double d0rpn =d0rpmc+dd0rpn-dd0mrpn;
-      double trackParDcaXYTuned = trackParDcaXYMC + deltaDcaXYTuned - deltaDcaXYmean;
+      double trackParDcaXYTuned = trackParDcaXYMC + deltaDcaXYTuned + deltaDcaXYmean;
 
       if (debugInfo) {
         LOG(info) << dcaZResMC << ", " << dcaZResData << ", diff(DcaZ - DcaZMC): " << deltaDcaZ << ", diff upgraded: " << deltaDcaZTuned << ", DcaZ Data : " << trackParDcaZTuned;

DPG/Tasks/AOTTrack/qaEfficiency.cxx

@@ -203,6 +203,7 @@ struct QaEfficiency {
   Configurable<bool> checkForMothers{"checkForMothers", false, "Flag to use the array of mothers to check if the particle of interest come from any of those particles"};
   Configurable<std::vector<int>> mothersPDGs{"mothersPDGs", std::vector<int>{3312, -3312}, "PDGs of origin of the particle under study"};
   Configurable<bool> keepOnlyHfParticles{"keepOnlyHfParticles", false, "Flag to decide wheter to consider only HF particles"};
+  Configurable<int> eventGeneratorType{"eventGeneratorType", -1, "Flag to check specific event generator (for HF): -1 -> no check, 0 -> MB events, 4 -> charm triggered, 5 -> beauty triggered"};
   // Track only selection, options to select only specific tracks
   Configurable<bool> trackSelection{"trackSelection", true, "Local track selection"};
   Configurable<int> globalTrackSelection{"globalTrackSelection", 0, "Global track selection: 0 -> No Cut, 1 -> kGlobalTrack, 2 -> kGlobalTrackWoPtEta, 3 -> kGlobalTrackWoDCA, 4 -> kQualityTracks, 5 -> kInAcceptanceTracks, 6 -> custom track cuts via Configurable"};
@@ -1778,6 +1779,11 @@ struct QaEfficiency {
       }
       histos.fill(HIST("MC/generatedCollisions"), 3);
 
+      if (eventGeneratorType >= 0 && mcCollision.getSubGeneratorId() != eventGeneratorType) {
+        LOG(debug) << "Skipping event with different type of generator than the one requested";
+        continue;
+      }
+
       /// loop over reconstructed collisions
       for (const auto& collision : groupedCollisions) {
         histos.fill(HIST("MC/generatedCollisions"), 4);