Merge branch 'AliceO2Group:master' into Add-preselection-and-centrality-to-STTree-creatore

Author: FDUEnrich

ALICE3/TableProducer/OTF/onTheFlyTrackerPid.cxx

@@ -136,38 +136,37 @@ class ToTLUT
 
   bool load(int pdg, const std::string& filename)
   {
-    if (!filename.empty() && strncmp(filename.c_str(), "ccdb:", 5) == 0) {
-      std::string basePath = std::string(filename).substr(5);
-      std::string path = basePath + "/PDG_" + std::to_string(pdg);
-      const std::string outPath = "/tmp/ToTLUTs/";
-
-      std::string localFilename = Form("%s/lut_tot_%d.root", outPath.c_str(), pdg);
+    if (filename.empty()) {
+      LOG(warning) << "Provided filename is empty for PDG " << pdg;
+      return false;
+    }
+    if (strncmp(filename.c_str(), "ccdb:", 5) == 0) { // Check if filename starts with "ccdb:"
+      const std::string basePath = std::string(filename).substr(5);
+      const std::string outPath = "/tmp/ToTLUTs/" + basePath;
+      const std::string localFilename = outPath + "/snapshot.root";
       std::ifstream checkFile(localFilename);
-      if (!checkFile.is_open()) {
+      if (!checkFile.is_open()) { // File is not found, need to download it from CCDB
         if (!mCcdbManager) {
           LOG(fatal) << "CCDB manager not set. Please set it before loading LUT from CCDB.";
         }
         std::map<std::string, std::string> metadata;
-        mCcdbManager->getCCDBAccessor().retrieveBlob(path, outPath, metadata, 1);
-
-        std::string foundFile = Form("%s/%s/snapshot.root", outPath.c_str(), path.c_str());
-        std::ifstream testFile(foundFile);
+        mCcdbManager->getCCDBAccessor().retrieveBlob(basePath, outPath, metadata, 1);
+        std::ifstream testFile(localFilename);
         if (!testFile.is_open()) {
-          LOG(error) << "Could not find downloaded CCDB file for PDG " << pdg;
+          LOG(fatal) << "Could not find downloaded CCDB file for PDG " << pdg;
           return false;
         }
         testFile.close();
-
-        return load(pdg, foundFile);
-      } else {
+        return load(pdg, localFilename);
+      } else { // File is found, proceed to load it
         checkFile.close();
         return load(pdg, localFilename);
       }
     }
-
+    // In case the file is already available locally
     TFile* f = TFile::Open(filename.c_str());
     if (!f || f->IsZombie()) {
-      LOG(error) << "Failed to open LUT file: " << filename;
+      LOG(fatal) << "Failed to open LUT file: " << filename;
       return false;
     }
 
@@ -397,15 +396,15 @@ struct OnTheFlyTrackerPid {
 
   HistogramRegistry histos{"histos", {}, OutputObjHandlingPolicy::AnalysisObject};
 
-  Configurable<std::string> lutTotEl{"lutTotEl", "ccdb:Users/h/hfribert/ToT_LUTs", "ToT LUT for electrons"};
-  Configurable<std::string> lutTotMu{"lutTotMu", "ccdb:Users/h/hfribert/ToT_LUTs", "ToT LUT for muons"};
-  Configurable<std::string> lutTotPi{"lutTotPi", "ccdb:Users/h/hfribert/ToT_LUTs", "ToT LUT for pions"};
-  Configurable<std::string> lutTotKa{"lutTotKa", "ccdb:Users/h/hfribert/ToT_LUTs", "ToT LUT for kaons"};
-  Configurable<std::string> lutTotPr{"lutTotPr", "ccdb:Users/h/hfribert/ToT_LUTs", "ToT LUT for protons"};
-  Configurable<std::string> lutTotDe{"lutTotDe", "ccdb:Users/h/hfribert/ToT_LUTs", "ToT LUT for deuteron"};
-  Configurable<std::string> lutTotTr{"lutTotTr", "ccdb:Users/h/hfribert/ToT_LUTs", "ToT LUT for triton"};
-  Configurable<std::string> lutTotHe{"lutTotHe", "ccdb:Users/h/hfribert/ToT_LUTs", "ToT LUT for helium-3"};
-  Configurable<std::string> lutTotAl{"lutTotAl", "ccdb:Users/h/hfribert/ToT_LUTs", "ToT LUT for alphas"};
+  Configurable<std::string> lutTotEl{"lutTotEl", "ccdb:Users/h/hfribert/ToT_LUTs/PDG_11/", "ToT LUT for electrons"};
+  Configurable<std::string> lutTotMu{"lutTotMu", "ccdb:Users/h/hfribert/ToT_LUTs/PDG_13/", "ToT LUT for muons"};
+  Configurable<std::string> lutTotPi{"lutTotPi", "ccdb:Users/h/hfribert/ToT_LUTs/PDG_211/", "ToT LUT for pions"};
+  Configurable<std::string> lutTotKa{"lutTotKa", "ccdb:Users/h/hfribert/ToT_LUTs/PDG_321/", "ToT LUT for kaons"};
+  Configurable<std::string> lutTotPr{"lutTotPr", "ccdb:Users/h/hfribert/ToT_LUTs/PDG_2212/", "ToT LUT for protons"};
+  Configurable<std::string> lutTotDe{"lutTotDe", "ccdb:Users/h/hfribert/ToT_LUTs/PDG_1000010020/", "ToT LUT for deuteron"};
+  Configurable<std::string> lutTotTr{"lutTotTr", "ccdb:Users/h/hfribert/ToT_LUTs/PDG_1000010030/", "ToT LUT for triton"};
+  Configurable<std::string> lutTotHe{"lutTotHe", "ccdb:Users/h/hfribert/ToT_LUTs/PDG_1000020030/", "ToT LUT for helium-3"};
+  Configurable<std::string> lutTotAl{"lutTotAl", "ccdb:Users/h/hfribert/ToT_LUTs/PDG_1000020040/", "ToT LUT for alphas"};
 
   Configurable<float> dBz{"dBz", 20, "magnetic field (kilogauss) for track propagation"};
   Configurable<int> maxBarrelLayers{"maxBarrelLayers", 11, "Maximum number of barrel layers"};

ALICE3/Tasks/alice3-qa-singleparticle.cxx

@@ -15,13 +15,13 @@
 /// \brief   Task to monitor the single particle QA, at the particle and track level, showing the tracked and the origin of particles
 ///
 
-// O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "TDatabasePDG.h"
-#include "TMCProcess.h"
+#include <Framework/AnalysisTask.h>
+#include <Framework/HistogramRegistry.h>
+#include <Framework/O2DatabasePDGPlugin.h>
+#include <Framework/runDataProcessing.h>
+
+#include <TDatabasePDG.h>
+#include <TMCProcess.h>
 
 using namespace o2;
 using namespace o2::framework;
@@ -97,11 +97,9 @@ struct Alice3SingleParticle {
     const AxisSpec axisProdz{prodBinsZ, prodMinZ, prodMaxZ, "Prod. Vertex Z (cm)"};
     const AxisSpec axisProdRadius{prodBins, 0., 2. * prodMax, "Prod. Vertex Radius (cm)"};
 
-    if (!doprocessParticleOnly) {
-      histos.add("event/VtxX", "Vertex X", kTH1D, {axisVx});
-      histos.add("event/VtxY", "Vertex Y", kTH1D, {axisVy});
-      histos.add("event/VtxZ", "Vertex Z", kTH1D, {axisVz});
-    }
+    histos.add("event/VtxX", "Vertex X", kTH1D, {axisVx});
+    histos.add("event/VtxY", "Vertex Y", kTH1D, {axisVy});
+    histos.add("event/VtxZ", "Vertex Z", kTH1D, {axisVz});
 
     histos.add("particle/PDGs", "Particle PDGs", kTH2D, {axisPDGs, axisCharge});
     histos.add("particle/PDGsPrimaries", "Particle PDGs of Primaries", kTH2D, {axisPDGs, axisCharge});
@@ -145,6 +143,7 @@ struct Alice3SingleParticle {
     histos.add("particle/Py", "Particle Py " + tit, kTH1D, {axisPy});
     histos.add("particle/Pz", "Particle Pz " + tit, kTH1D, {axisPz});
 
+    histos.add("particle/daughters/Number", "Number of Daughters " + tit, kTH1D, {{20, -0.5, 19.5}});
     histos.add("particle/daughters/PDGs", "Daughters PDGs " + tit, kTH2D, {axisPDGs, axisCharge});
     histos.add("particle/daughters/PDGsPrimaries", "Daughters PDGs Primaries of " + tit, kTH2D, {axisPDGs, axisCharge});
     histos.add("particle/daughters/PDGsSecondaries", "Daughters PDGs Secondaries of " + tit, kTH2D, {axisPDGs, axisCharge});
@@ -158,6 +157,7 @@ struct Alice3SingleParticle {
     histos.add("particle/daughters/prodRadiusVsPt", "Daughters Prod. Vertex Radius " + tit, kTH2D, {axisPt, axisProdRadius});
     histos.add("particle/daughters/prodRadius3DVsPt", "Daughters Prod. Vertex Radius XYZ " + tit, kTH2D, {axisPt, axisProdRadius});
 
+    histos.add("particle/mothers/Number", "Number of Mothers " + tit, kTH1D, {{20, -0.5, 19.5}});
     histos.add("particle/mothers/PDGs", "Mothers PDGs " + tit, kTH2D, {axisPDGs, axisCharge});
     histos.add("particle/mothers/PDGsPrimaries", "Mothers PDGs Primaries of " + tit, kTH2D, {axisPDGs, axisCharge});
     histos.add("particle/mothers/PDGsSecondaries", "Mothers PDGs Secondaries of " + tit, kTH2D, {axisPDGs, axisCharge});
@@ -167,6 +167,8 @@ struct Alice3SingleParticle {
     histos.add("particle/mothers/prodRadiusVsPt", "Mothers Prod. Vertex Radius " + tit, kTH2D, {axisPt, axisProdRadius});
     histos.add("particle/mothers/prodRadius3DVsPt", "Mothers Prod. Vertex Radius XYZ " + tit, kTH2D, {axisPt, axisProdRadius});
 
+    // Go up one generation
+    histos.add("particle/mothers/mothers/Number", "Number of Mothers mothers " + tit, kTH1D, {{20, -0.5, 19.5}});
     histos.add("particle/mothers/mothers/PDGs", "Mothers mothers PDGs " + tit, kTH2D, {axisPDGs, axisCharge});
     histos.add("particle/mothers/mothers/PDGsPrimaries", "Mothers mothers PDGs Primaries of " + tit, kTH2D, {axisPDGs, axisCharge});
     histos.add("particle/mothers/mothers/PDGsSecondaries", "Mothers mothers PDGs Secondaries of " + tit, kTH2D, {axisPDGs, axisCharge});
@@ -272,6 +274,7 @@ struct Alice3SingleParticle {
       histos.fill(HIST("particle/prodVz"), mcParticle.vz());
       if (mcParticle.has_daughters()) {
         auto daughters = mcParticle.daughters_as<aod::McParticles>();
+        histos.fill(HIST("particle/daughters/Number"), daughters.size());
         for (const auto& daughter : daughters) {
           const auto& pdgStringDau = getPdgCodeString(daughter);
           const auto& pdgChargeDau = getCharge(daughter);
@@ -293,6 +296,8 @@ struct Alice3SingleParticle {
           histos.fill(HIST("particle/daughters/prodRadiusVsPt"), mcParticle.pt(), std::sqrt(daughter.vx() * daughter.vx() + daughter.vy() * daughter.vy()));
           histos.fill(HIST("particle/daughters/prodRadius3DVsPt"), mcParticle.pt(), std::sqrt(daughter.vx() * daughter.vx() + daughter.vy() * daughter.vy() + daughter.vz() * daughter.vz()));
         }
+      } else {
+        histos.fill(HIST("particle/daughters/Number"), 0.f);
       }
       if (mcParticle.has_mothers()) {
         const auto& mothers = mcParticle.mothers_as<aod::McParticles>();
@@ -415,8 +420,14 @@ struct Alice3SingleParticle {
   }
   PROCESS_SWITCH(Alice3SingleParticle, processStandard, "Process IU tracks", true);
 
-  void processParticleOnly(const aod::McParticles& mcParticles)
+  void processParticleOnly(const o2::aod::McCollisions& colls,
+                           const aod::McParticles& mcParticles)
   {
+    for (const auto& col : colls) {
+      histos.fill(HIST("event/VtxX"), col.posX());
+      histos.fill(HIST("event/VtxY"), col.posY());
+      histos.fill(HIST("event/VtxZ"), col.posZ());
+    }
     for (const auto& mcParticle : mcParticles) {
       const auto& pdgString = getPdgCodeString(mcParticle);
       const auto& pdgCharge = getCharge(mcParticle);
@@ -467,6 +478,7 @@ struct Alice3SingleParticle {
       histos.fill(HIST("particle/prodVz"), mcParticle.vz());
       if (mcParticle.has_daughters()) {
         auto daughters = mcParticle.daughters_as<aod::McParticles>();
+        histos.fill(HIST("particle/daughters/Number"), daughters.size());
         for (const auto& daughter : daughters) {
           const auto& pdgStringDau = getPdgCodeString(daughter);
           const auto& pdgChargeDau = getCharge(daughter);
@@ -484,6 +496,8 @@ struct Alice3SingleParticle {
           histos.fill(HIST("particle/daughters/prodRadiusVsPt"), mcParticle.pt(), std::sqrt(mcParticle.vx() * mcParticle.vx() + mcParticle.vy() * mcParticle.vy()));
           histos.fill(HIST("particle/daughters/prodRadius3DVsPt"), mcParticle.pt(), std::sqrt(mcParticle.vx() * mcParticle.vx() + mcParticle.vy() * mcParticle.vy() + mcParticle.vz() * mcParticle.vz()));
         }
+      } else {
+        histos.fill(HIST("particle/daughters/Number"), 0.f);
       }
       if (mcParticle.has_mothers()) {
         auto mothers = mcParticle.mothers_as<aod::McParticles>();
@@ -586,6 +600,7 @@ struct Alice3SingleParticle {
       histos.fill(HIST("particle/prodVz"), mcParticle.vz());
       if (mcParticle.has_daughters()) {
         auto daughters = mcParticle.daughters_as<aod::McParticles>();
+        histos.fill(HIST("particle/daughters/Number"), daughters.size());
         for (const auto& daughter : daughters) {
           const auto& pdgStringDau = getPdgCodeString(daughter);
           const auto& pdgChargeDau = getCharge(daughter);
@@ -603,6 +618,8 @@ struct Alice3SingleParticle {
           histos.fill(HIST("particle/daughters/prodRadiusVsPt"), mcParticle.pt(), std::sqrt(mcParticle.vx() * mcParticle.vx() + mcParticle.vy() * mcParticle.vy()));
           histos.fill(HIST("particle/daughters/prodRadius3DVsPt"), mcParticle.pt(), std::sqrt(mcParticle.vx() * mcParticle.vx() + mcParticle.vy() * mcParticle.vy() + mcParticle.vz() * mcParticle.vz()));
         }
+      } else {
+        histos.fill(HIST("particle/daughters/Number"), 0.f);
       }
       if (mcParticle.has_mothers()) {
         auto mothers = mcParticle.mothers_as<aod::McParticles>();

PWGLF/TableProducer/Nuspex/he3HadronFemto.cxx

@@ -129,6 +129,8 @@ std::array<float, 3> kDCAzResolutionParams[static_cast<int>(Species::kAllSpecies
   {0.0021, 1.1122, 0.0021}  // Pr
 };
 
+std::array<float, 2> kHePidTrkParams = {0.1593, -0.0445};
+
 } // namespace
 
 struct He3HadCandidate {
@@ -472,6 +474,15 @@ struct he3HadronFemto {
     return true;
   }
 
+  template <typename Ttrack>
+  float correctPtHe3TrackedAsTriton(const Ttrack& candidate)
+  {
+    if (candidate.pt() < 2.5 && candidate.pidForTracking() == o2::track::PID::Triton)
+      return candidate.pt() * 2. * (1. - kHePidTrkParams[0] - kHePidTrkParams[1] * candidate.pt() * 2.);
+
+    return candidate.pt() * 2.;
+  }
+
   float computeNsigmaDCA(const float pt, const float dca, const int iSpecies, const char* dcaType = "xy")
   {
 
@@ -1337,7 +1348,9 @@ struct he3HadronFemto {
       if (!selectTrack(track, Species::kHe3) || !selectDcaNsigmaCut(track, Species::kHe3))
         continue;
 
-      mQaRegistry.fill(HIST("He3/hHe3Pt"), track.pt() * 2.f);
+      const float ptHe3Corrected = correctPtHe3TrackedAsTriton(track);
+
+      mQaRegistry.fill(HIST("He3/hHe3Pt"), ptHe3Corrected);
       mQaRegistry.fill(HIST("He3/hDCAxyHe3"), track.dcaXY());
       mQaRegistry.fill(HIST("He3/hDCAzHe3"), track.dcaZ());
 
@@ -1348,7 +1361,7 @@ struct he3HadronFemto {
       }
 
       const float nSigmaHe3 = computeNSigmaHe3(track);
-      mQaRegistry.fill(HIST("He3/h2NsigmaHe3TPC_preselection"), track.sign() * 2 * track.pt(), nSigmaHe3);
+      mQaRegistry.fill(HIST("He3/h2NsigmaHe3TPC_preselection"), track.sign() * ptHe3Corrected, nSigmaHe3);
     }
   }
   PROCESS_SWITCH(he3HadronFemto, processPurity, "Process for purity studies", false);

PWGLF/Tasks/Nuspex/antinucleiInJets.cxx

@@ -121,6 +121,7 @@ struct AntinucleiInJets {
   Configurable<double> maxNormalizedJetArea{"maxNormalizedJetArea", 1.0, "area cut"};
   Configurable<double> deltaEtaEdge{"deltaEtaEdge", 0.05, "eta gap from the edge"};
   Configurable<int> nSyst{"nSyst", 50, "number of systematic variations"};
+  Configurable<int> nSubsamples{"nSubsamples", 50, "number of subsamples"};
 
   // Track quality, kinematic, and PID selection parameters
   Configurable<bool> requirePvContributor{"requirePvContributor", false, "require that the track is a PV contributor"};
@@ -472,7 +473,7 @@ struct AntinucleiInJets {
       const AxisSpec nBarD2Axis{100, 0.0, 100.0, "N_{#bar{d}}^{i} #times N_{#bar{d}}^{j}"};
       const AxisSpec nBarP2Axis{100, 0.0, 100.0, "N_{#bar{p}}^{i} #times N_{#bar{p}}^{j}"};
       const AxisSpec nBarDnBarPAxis{100, 0.0, 100.0, "N_{#bar{d}}^{i} #times N_{#bar{p}}^{j}"};
-      const AxisSpec subsampleAxis{20, 0, 20, "Subsample Index"};
+      const AxisSpec subsampleAxis{nSubsamples, 0, static_cast<double>(nSubsamples), "Subsample Index"};
 
       // Event counter
       registryCorr.add("eventCounter", "number of events", HistType::kTH1F, {{20, 0, 20, "counter"}});
@@ -2684,7 +2685,7 @@ struct AntinucleiInJets {
     registryCorr.fill(HIST("eventCounter"), 7.5);
 
     // Assign event to a random subsample (0-19)
-    double sampleId = mRand.Integer(20) + 0.5;
+    double sampleId = mRand.Integer(nSubsamples) + 0.5;
 
     // Multiplicity percentile
     const float multiplicity = collision.centFT0M();