Merge branch 'AliceO2Group:master' into master

Author: prchakra

CODEOWNERS

@@ -52,11 +52,11 @@
 /PWGLF/TableProducer/Strangeness @alibuild @sustripathy @skundu692 @ercolessi @romainschotter
 /PWGLF/Utils @alibuild @sustripathy @skundu692 @gbencedi @abmodak @fmazzasc @maciacco @dmallick2 @smaff92 @ercolessi @romainschotter
 
-# PWG-MM
+# PWG-MM (fused with LF, LF conveners included. Directories to be merged in the future)
 /PWGMM      @alibuild @sustripathy @skundu692 @aalkin @jgcn
 /PWGMM/Mult @alibuild @sustripathy @skundu692 @aalkin @aortizve @ddobrigk @gbencedi @jgcn
-/PWGMM/Lumi @alibuild @aalkin @jgcn
-/PWGMM/UE   @alibuild @aalkin @aortizve @jgcn
+/PWGMM/Lumi @alibuild @sustripathy @skundu692 @aalkin @jgcn @gbencedi @abmodak
+/PWGMM/UE   @alibuild @sustripathy @skundu692 @aalkin @aortizve @jgcn
 
 /PWGUD @alibuild @pbuehler @nystrand @rolavick
 /PWGJE @alibuild @lhavener @maoyx @nzardosh @fjonasALICE @mfasDa @mhemmer-cern

PWGCF/Tasks/correlations.cxx

@@ -182,6 +182,7 @@ struct CorrelationTask {
       if (doprocessSame2Prong2Prong || doprocessSame2Prong2ProngML) {
         registry.add("invMassTwoPart", "2D 2-prong invariant mass (GeV/c^2)", {HistType::kTHnSparseF, {axisSpecMass, axisSpecMass, axisPtTrigger, axisPtAssoc, axisMultiplicity}});
         registry.add("invMassTwoPartDPhi", "2D 2-prong invariant mass (GeV/c^2)", {HistType::kTHnSparseF, {axisSpecMass, axisSpecMass, axisPtTrigger, axisPtAssoc, axisDeltaPhi}});
+        registry.add("invMassTwoPartDEta", "2D 2-prong invariant mass (GeV/c^2)", {HistType::kTHnSparseF, {axisSpecMass, axisSpecMass, axisPtTrigger, axisPtAssoc, axisDeltaEta}});
       }
     }
     if (doprocessSameDerivedMultSet) {
@@ -394,6 +395,9 @@ struct CorrelationTask {
                 continue;
               registry.fill(HIST("invMassTwoPart"), track1.invMass(), track2.invMass(), track1.pt(), track2.pt(), multiplicity);
               registry.fill(HIST("invMassTwoPartDPhi"), track1.invMass(), track2.invMass(), track1.pt(), track2.pt(), TVector2::Phi_0_2pi(track1.phi() - track2.phi() + TMath::Pi() / 2.0) - TMath::Pi() / 2.0);
+              if (std::abs(track1.phi() - track2.phi()) < constants::math::PI * 0.5) {
+                registry.fill(HIST("invMassTwoPartDEta"), track1.invMass(), track2.invMass(), track1.pt(), track2.pt(), track1.eta() - track2.eta());
+              }
             }
           }
         }
@@ -637,7 +641,7 @@ struct CorrelationTask {
             continue; // skip particles that do not match the decay mask
           }
           if (cfgV0RapidityMax > 0) {
-            auto [t, y] = getV0Rapidity(track1);
+            auto [t, y] = getV0Rapidity(track2);
             if (t && std::abs(y) > cfgV0RapidityMax)
               continue; // V0s are not allowed to be outside the rapidity range
           }

PWGHF/D2H/TableProducer/candidateCreatorCharmResoReduced.cxx

@@ -99,15 +99,15 @@ struct HfTaskOmegac0ToOmegapi {
   Preslice<Omegac0CandsMlKF> candOmegacKFMlPerCollision = aod::hf_cand_xic0_omegac0::collisionId;
   PresliceUnsorted<CollisionsWithMcLabels> colPerMcCollision = aod::mccollisionlabel::mcCollisionId;
 
-  ConfigurableAxis thnConfigAxisPromptScore{"thnConfigAxisPromptScore", {100, 0, 1}, "Prompt score"};
   ConfigurableAxis thnConfigAxisMass{"thnConfigAxisMass", {700, 2.4, 3.1}, "Cand. inv. mass"};
   ConfigurableAxis thnConfigAxisPt{"thnConfigAxisPt", {500, 0, 50}, "Cand. pT"};
   ConfigurableAxis thnConfigAxisPtB{"thnConfigAxisPtB", {500, 0, 50}, "Cand. beauty mother pT"};
   ConfigurableAxis thnConfigAxisY{"thnConfigAxisY", {20, -1, 1}, "Cand. rapidity"};
-  ConfigurableAxis thnConfigAxisCent{"thnConfigAxisCent", {100, 0, 100}, "Centrality"};
   ConfigurableAxis thnConfigAxisOrigin{"thnConfigAxisOrigin", {3, -0.5, 2.5}, "Cand. origin"};
   ConfigurableAxis thnConfigAxisMatchFlag{"thnConfigAxisMatchFlag", {15, -7.5, 7.5}, "Cand. MC match flag"};
-  ConfigurableAxis thnConfigAxisNumPvContr{"thnConfigAxisNumPvContr", {200, -0.5, 199.5}, "PV contributors"};
+  ConfigurableAxis thnConfigAxisNumPvContr{"thnConfigAxisNumPvContr", {200, -0.5, 199.5}, "Coll. num. PV contributors"};
+  ConfigurableAxis thnConfigAxisCent{"thnConfigAxisCent", {100, 0, 100}, "Coll. centrality precentile"};
+  ConfigurableAxis thnConfigAxisPromptScore{"thnConfigAxisPromptScore", {100, 0, 1}, "Prompt score"};
   HistogramRegistry registry{"registry", {}};
 
   void init(InitContext&)
@@ -119,23 +119,29 @@ struct HfTaskOmegac0ToOmegapi {
       LOGP(fatal, "One and only one process function should be enabled at a time.");
     }
 
-    const AxisSpec thnAxisMass{thnConfigAxisMass, "inv. mass (#Omega#pi) (GeV/#it{c}^{2})"};
+    const AxisSpec thnAxisMass{thnConfigAxisMass, "Inv. mass (#Omega#pi) (GeV/#it{c}^{2})"};
     const AxisSpec thnAxisPt{thnConfigAxisPt, "#it{p}_{T} (GeV/#it{c})"};
     const AxisSpec thnAxisPtB{thnConfigAxisPtB, "#it{p}_{T}^{B} (GeV/#it{c})"};
     const AxisSpec thnAxisY{thnConfigAxisY, "y"};
     const AxisSpec thnAxisOrigin{thnConfigAxisOrigin, "Origin"};
     const AxisSpec thnAxisMatchFlag{thnConfigAxisMatchFlag, "MC match flag"};
-    const AxisSpec thnAxisNumPvContr{thnConfigAxisNumPvContr, "PV contributors"};
+    const AxisSpec thnAxisNumPvContr{thnConfigAxisNumPvContr, "Number of primary vtx. contributors"};
+    const AxisSpec thnAxisCent{thnConfigAxisCent, "Centrality percentile"};
+    const AxisSpec thnAxisCentMc{thnConfigAxisCent, "Centrality percentile (from gen. MC info)"};
     const AxisSpec thnAxisPromptScore{thnConfigAxisPromptScore, "BDT score prompt"};
-    const AxisSpec thnAxisCent{thnConfigAxisCent, "Centrality"};
 
     std::vector<AxisSpec> axes = {thnAxisMass, thnAxisPt, thnAxisY};
     std::vector<AxisSpec> axesMcGen = {thnAxisPt, thnAxisPtB, thnAxisY, thnAxisOrigin};
 
-    if (doprocessDataKFParticleFT0C || doprocessDataKFParticleMlFT0C || doprocessDataKFParticleFT0M || doprocessDataKFParticleMlFT0M || doprocessMcKFParticleFT0M || doprocessMcKFParticleMlFT0M) {
+    if (doprocessDataKFParticleFT0C || doprocessDataKFParticleMlFT0C || doprocessDataKFParticleFT0M || doprocessDataKFParticleMlFT0M) {
       axes.push_back(thnAxisCent);
       axes.push_back(thnConfigAxisNumPvContr);
-      axesMcGen.push_back(thnAxisCent);
+    }
+
+    if (doprocessMcKFParticleFT0M || doprocessMcKFParticleMlFT0M) {
+      axes.push_back(thnAxisCentMc);
+      axes.push_back(thnConfigAxisNumPvContr);
+      axesMcGen.push_back(thnAxisCentMc);
       axesMcGen.push_back(thnConfigAxisNumPvContr);
     }
 
@@ -145,7 +151,7 @@ struct HfTaskOmegac0ToOmegapi {
 
       if (doprocessMcKFParticleFT0M || doprocessMcKFParticleMlFT0M) {
         registry.add("hMcGenWithRecoColl", "Gen. #Omega_{c}^{0} from charm and beauty (associated to a reco collision)", HistType::kTHnSparseD, axesMcGen);
-        registry.add("hNumRecoCollPerMcColl", "Number of reco collisions associated to a mc collision;Num. reco. coll. per Mc coll.;", {HistType::kTH1D, {{10, -1.5, 8.5}}});
+        registry.add("hNumRecoCollPerMcColl", "Number of reco collisions associated to a mc collision;Num. reco. coll. per Mc coll.;", {HistType::kTH1D, {{10, -0.5, 9.5}}});
         registry.get<THnSparse>(HIST("hMcGenWithRecoColl"))->Sumw2();
       }
 

PWGHF/D2H/Tasks/taskOmegac0ToOmegapi.cxx

@@ -36,6 +36,10 @@ using namespace o2::framework::expressions;
 struct V0SelectorTask {
   Produces<aod::V0SignalFlags> v0FlagTable;
 
+  Configurable<bool> selectK0S{"selectK0S", true, "Check V0s for K0S cuts"};
+  Configurable<bool> selectLambda{"selectLambda", true, "Check V0s for Lambda cuts"};
+  Configurable<bool> selectAntiLambda{"selectAntiLambda", true, "Check V0s for AntiLambda cuts"};
+
   Configurable<std::vector<float>> K0SPtBins{"K0SPtBins", {0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 10.0, 15.0, 20.0, 25.0, 30.0}, "K0S pt Vals"};
   Configurable<std::vector<float>> K0SRminVals{"K0SRminVals", {1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0}, "K0S min R values"};
   Configurable<std::vector<float>> K0SRmaxVals{"K0SRmaxVals", {40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0}, "K0S max R values"};
@@ -85,7 +89,7 @@ struct V0SelectorTask {
   Configurable<std::vector<float>> AntiLambdaMassLowVals{"AntiLambdaMassLowVals", {1.08, 1.08, 1.08, 1.08, 1.08, 1.08, 1.08, 1.08}, "AntiLambda mass cut lower values (MeV)"};
   Configurable<std::vector<float>> AntiLambdaMassHighVals{"AntiLambdaMassHighVals", {1.125, 1.125, 1.125, 1.125, 1.125, 1.125, 1.125, 1.125}, "AntiLambda mass cut upper values (MeV)"};
 
-  Configurable<bool> randomSelection{"randomSelection", true, "Randomly select V0s"};
+  Configurable<bool> randomSelection{"randomSelection", false, "Randomly select V0s"};
   Configurable<std::vector<float>> K0SFraction{"K0SFraction", {2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0}, "Fraction of K0S to randomly select"};
   Configurable<std::vector<float>> LambdaFraction{"LambdaFraction", {2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0}, "Fraction of Lambda to randomly select"};
   Configurable<std::vector<float>> AntiLambdaFraction{"AntiLambdaFraction", {2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0}, "Fraction of AntiLambda to randomly select"};
@@ -277,13 +281,16 @@ struct V0SelectorTask {
   {
     for (const auto& v0 : v0s) {
       uint8_t flag = 0;
-      flag += K0SCuts(collision, v0) * aod::v0flags::FK0S;
-      flag += LambdaCuts(collision, v0) * aod::v0flags::FLAMBDA;
-      flag += AntiLambdaCuts(collision, v0) * aod::v0flags::FANTILAMBDA;
+      if (selectK0S)
+        flag += K0SCuts(collision, v0) * aod::v0flags::FK0S;
+      if (selectLambda)
+        flag += LambdaCuts(collision, v0) * aod::v0flags::FLAMBDA;
+      if (selectAntiLambda)
+        flag += AntiLambdaCuts(collision, v0) * aod::v0flags::FANTILAMBDA;
 
       if (flag == 0)
         flag += aod::v0flags::FREJECTED;
-      else
+      else if (randomSelection)
         flag += RandomlyReject(v0, flag) * aod::v0flags::FREJECTED;
 
       v0FlagTable(flag);