Merge branch 'master' of github.com:m-rasa/O2Physics

Author: m-rasa

ALICE3/TableProducer/alice3-correlatorDDbar.cxx

@@ -89,8 +89,6 @@ struct alice3correlatorddbar {
   Configurable<std::vector<double>> binsPt{"binsPt", std::vector<double>{o2::analysis::hf_cuts_d0_to_pi_k::vecBinsPt}, "pT bin limits for candidate mass plots and efficiency"};
   Configurable<std::vector<double>> efficiencyD{"efficiencyD", std::vector<double>{efficiencyDmeson_v}, "Efficiency values for D0 meson"};
 
-  // HfHelper hfHelper; //not needed for now
-
   Partition<soa::Join<aod::Alice3D0Meson, aod::Alice3D0Sel>> selectedCandidates = aod::a3D0meson::y > -yCandMax&& aod::a3D0meson::y<yCandMax && aod::a3D0meson::pt> ptCandMin && (aod::a3D0Selection::isSelD0 >= selectionFlagD0 || aod::a3D0Selection::isSelD0bar >= selectionFlagD0bar);
   Partition<soa::Join<aod::Alice3D0Meson, aod::Alice3D0Sel, aod::Alice3D0MCTruth>> selectedCandidatesMC = aod::a3D0meson::y > -yCandMax&& aod::a3D0meson::y<yCandMax && aod::a3D0meson::pt> ptCandMin && (aod::a3D0Selection::isSelD0 >= selectionFlagD0 || aod::a3D0Selection::isSelD0bar >= selectionFlagD0bar);
 

ALICE3/TableProducer/alice3HfSelector3Prong.cxx

@@ -93,7 +93,6 @@ struct Alice3HfSelector3Prong {
   Configurable<int64_t> timestampCCDB{"timestampCCDB", -1, "timestamp of the ONNX file for ML model used to query in CCDB"};
   Configurable<bool> loadModelsFromCCDB{"loadModelsFromCCDB", false, "Flag to enable or disable the loading of models from CCDB"};
 
-  HfHelperAlice3 hfHelper;
   o2::analysis::HfMlResponse3Prong<float> mlResponse;
   o2::ccdb::CcdbApi ccdbApi;
 
@@ -236,7 +235,7 @@ struct Alice3HfSelector3Prong {
   template <CharmHadAlice3 CharmHad, bool SwapHypo, typename TCandidate>
   bool selectionCandidateMass(int const ptBin, const TCandidate& cand)
   {
-    const float massCand = hfHelper.getCandMass<CharmHad, SwapHypo>(cand);
+    const float massCand = HfHelperAlice3::getCandMass<CharmHad, SwapHypo>(cand);
     // cut on mass window
     if (std::abs(massCand - MassReference) > cuts->get(ptBin, "m")) {
       return false;

ALICE3/TableProducer/alice3HfTreeCreator3Prong.cxx

@@ -272,8 +272,6 @@ struct Alice3HfTreeCreator3Prong {
   Configurable<float> downSampleFactor{"downSampleFactor", 1., "Fraction of cands to keep"};
   Configurable<float> ptMaxForDownSample{"ptMaxForDownSample", 10., "Maximum pt for the application of the downsampling factor"};
 
-  HfHelperAlice3 hfHelper;
-
   using CandsLcRec = soa::Filtered<soa::Join<aod::Alice3Cand3Ps, aod::Alice3Sel3Ps, aod::Alice3PidLcs, aod::Alice3McRecFlags>>;
   using CandsLcRecWMl = soa::Filtered<soa::Join<aod::Alice3Cand3Ps, aod::Alice3Sel3Ps, aod::Alice3PidLcs, aod::Alice3Ml3Ps, aod::Alice3McRecFlags>>;
   using CandsMcGen = soa::Join<aod::McParticles, aod::Alice3McGenFlags>;
@@ -399,7 +397,7 @@ struct Alice3HfTreeCreator3Prong {
       rowCandKine3Ps(
         cand.ptProng0(), cand.ptProng1(), cand.ptProng2(),
         cand.pt(), RecoDecay::p(cand.px(), cand.py(), cand.pz()), cand.eta(), cand.phi(),
-        hfHelper.getCandMass<CharmHad, IsSwapMassHypo>(cand), hfHelper.getCandY<CharmHad>(cand), hfHelper.getCandEnergy<CharmHad>(cand));
+        HfHelperAlice3::getCandMass<CharmHad, IsSwapMassHypo>(cand), HfHelperAlice3::getCandY<CharmHad>(cand), HfHelperAlice3::getCandEnergy<CharmHad>(cand));
     }
     if (fillTables.fillDaugKineInfo) {
       rowDaugMoms(
@@ -442,7 +440,7 @@ struct Alice3HfTreeCreator3Prong {
   {
     for (const auto& part : parts) {
       if (fillTables.fillCandGenKineInfo) {
-        rowCand3PGen(part.pt(), part.eta(), part.phi(), hfHelper.getCandY<CharmHad>(part));
+        rowCand3PGen(part.pt(), part.eta(), part.phi(), HfHelperAlice3::getCandY<CharmHad>(part));
       }
       if (fillTables.fillMcMatchGenInfo) {
         rowCand3PMcMatchGen(part.flagMcGen(), part.originMcGen());

ALICE3/Tasks/alice3HfTask3Prong.cxx

@@ -58,7 +58,6 @@ struct Alice3HfTask3Prong {
   Configurable<std::string> ccdbPathGrp{"ccdbPathGrp", "GLO/GRP/GRP", "Path of the grp file (Run 2)"};
   Configurable<std::string> ccdbPathGrpMag{"ccdbPathGrpMag", "GLO/Config/GRPMagField", "CCDB path of the GRPMagField object (Run 3)"};
 
-  HfHelperAlice3 hfHelper;
   SliceCache cache;
   Service<o2::ccdb::BasicCCDBManager> ccdb;
 
@@ -271,7 +270,7 @@ struct Alice3HfTask3Prong {
     for (const auto& candidate : candidates) {
       registry.fill(HIST("MC/rec/hCandidateCounter"), 1.);
       /// rapidity selection
-      if (yCandRecoMax >= 0. && std::abs(hfHelper.getCandY<CharmHad>(candidate)) > yCandRecoMax) {
+      if (yCandRecoMax >= 0. && std::abs(HfHelperAlice3::getCandY<CharmHad>(candidate)) > yCandRecoMax) {
         continue;
       }
       registry.fill(HIST("MC/rec/hCandidateCounter"), 2.);
@@ -311,7 +310,7 @@ struct Alice3HfTask3Prong {
 
         if (candidate.isSelMassHypo0()) {
           registry.fill(HIST("hSelectionStatus"), 0., pt);
-          double mass = hfHelper.getCandMass<CharmHad, false>(candidate);
+          double mass = HfHelperAlice3::getCandMass<CharmHad, false>(candidate);
           /// Fill histograms
           fillHistogramsRecSig<CharmHad, SignalClasses::Signal>(candidate, mass, false);
           if (originType == RecoDecay::OriginType::Prompt) {
@@ -334,7 +333,7 @@ struct Alice3HfTask3Prong {
         if (fillSwapMassHypo) {
           if (candidate.isSelMassHypo1()) {
             registry.fill(HIST("hSelectionStatus"), 1., pt);
-            double mass = hfHelper.getCandMass<CharmHad, true>(candidate);
+            double mass = HfHelperAlice3::getCandMass<CharmHad, true>(candidate);
             /// Fill histograms
             fillHistogramsRecSig<CharmHad, SignalClasses::Signal>(candidate, mass, true);
             if (originType == RecoDecay::OriginType::Prompt) {
@@ -357,12 +356,12 @@ struct Alice3HfTask3Prong {
         }
       } else { // Background
         if (candidate.isSelMassHypo0()) {
-          double mass = hfHelper.getCandMass<CharmHad, false>(candidate);
+          double mass = HfHelperAlice3::getCandMass<CharmHad, false>(candidate);
           fillHistogramsRecSig<CharmHad, SignalClasses::Bkg>(candidate, mass, false);
         }
         if (fillSwapMassHypo) {
           if (candidate.isSelMassHypo1()) {
-            double mass = hfHelper.getCandMass<CharmHad, true>(candidate);
+            double mass = HfHelperAlice3::getCandMass<CharmHad, true>(candidate);
             fillHistogramsRecSig<CharmHad, SignalClasses::Bkg>(candidate, mass, true);
           }
         }
@@ -385,10 +384,10 @@ struct Alice3HfTask3Prong {
     static constexpr auto histoSuffix = HIST("Gen") + HIST(SignalSuffixes[SignalType]);
     registry.fill(histoPrefix + HIST("hPt") + histoSuffix, particle.pt());
     registry.fill(histoPrefix + HIST("hEta") + histoSuffix, particle.eta());
-    registry.fill(histoPrefix + HIST("hY") + histoSuffix, hfHelper.getCandY<CharmHad>(particle));
+    registry.fill(histoPrefix + HIST("hY") + histoSuffix, HfHelperAlice3::getCandY<CharmHad>(particle));
     registry.fill(histoPrefix + HIST("hPhi") + histoSuffix, particle.phi());
     registry.fill(histoPrefix + HIST("hEtaVsPt") + histoSuffix, particle.eta(), particle.pt());
-    registry.fill(histoPrefix + HIST("hYVsPt") + histoSuffix, hfHelper.getCandY<CharmHad>(particle), particle.pt());
+    registry.fill(histoPrefix + HIST("hYVsPt") + histoSuffix, HfHelperAlice3::getCandY<CharmHad>(particle), particle.pt());
     registry.fill(histoPrefix + HIST("hPhiVsPt") + histoSuffix, particle.phi(), particle.pt());
     if (particle.has_daughters()) {
       const auto firstDauIdx = particle.daughtersIds().front();
@@ -424,7 +423,7 @@ struct Alice3HfTask3Prong {
     // MC gen.
     for (const auto& particle : mcParticles) {
       if (std::abs(particle.flagMcGen()) == selectedPdg) {
-        double yGen = hfHelper.getCandY<CharmHad>(particle);
+        double yGen = HfHelperAlice3::getCandY<CharmHad>(particle);
         if (yCandGenMax >= 0. && std::abs(yGen) > yCandGenMax) {
           continue;
         }

ALICE3/Tasks/alice3TrackingPerformance.cxx

@@ -35,6 +35,7 @@
 #include <TString.h>
 
 #include <algorithm>
+#include <cstdlib>
 #include <map>
 #include <memory>
 #include <string>
@@ -46,9 +47,20 @@ using namespace o2::framework;
 struct Alice3TrackingPerformance {
   Configurable<std::vector<int>> pdgCodes{"pdgCodes", {211}, "List of signed PDG codes to consider for performance evaluation"};
   HistogramRegistry histos{"Histos", {}, OutputObjHandlingPolicy::AnalysisObject};
-  ConfigurableAxis ptAxis{"ptAxis", {500, 0, 100}, "#it{p}_{T} (GeV/#it{c})"};
-  ConfigurableAxis etaAxis{"etaAxis", {100, -5.f, 5.f}, "#eta"};
-  ConfigurableAxis invPtDeltaAxis{"invPtDeltaAxis", {1000, -0.1f, 0.1f}, "1./#it{p}_{T}^{gen} - 1./#it{p}_{T}^{reco} (GeV/#it{c})^{-1}"};
+  struct : ConfigurableGroup {
+    std::string prefix = "Axes"; // JSON group name
+    ConfigurableAxis ptAxis{"ptAxis", {500, 0, 100}, "#it{p}_{T} (GeV/#it{c})"};
+    ConfigurableAxis etaAxis{"etaAxis", {100, -5.f, 5.f}, "#eta"};
+    ConfigurableAxis invPtDeltaAxis{"invPtDeltaAxis", {1000, -0.1f, 0.1f}, "1./#it{p}_{T}^{gen} - 1./#it{p}_{T}^{reco} (GeV/#it{c})^{-1}"};
+    ConfigurableAxis dcaAxis{"dcaAxis", {1000, -0.1f, 0.1f}, "DCA (cm)"};
+  } settingsAxes;
+
+  struct : ConfigurableGroup {
+    std::string prefix = "Selections"; // JSON group name
+    Configurable<float> vtxSelX{"vtxSelX", -1.f, "Vertex selection in X (cm), if negative no selection is applied"};
+    Configurable<float> vtxSelY{"vtxSelY", -1.f, "Vertex selection in Y (cm), if negative no selection is applied"};
+    Configurable<float> vtxSelZ{"vtxSelZ", -1.f, "Vertex selection in Z (cm), if negative no selection is applied"};
+  } settingsSelections;
 
   // Histograms
   std::shared_ptr<TH1> particlePdgCodes;
@@ -75,8 +87,11 @@ struct Alice3TrackingPerformance {
       pdgCodes.value.push_back(0);
     }
     const AxisSpec axisPtDelta{100, -1, 1, "(#it{p}_{T}^{reco} - #it{p}_{T}^{gen}) / #it{p}_{T}^{gen}"};
-    const AxisSpec axisDcaXy{100, -1, 1, "DCA_{xy} (cm)"};
-    const AxisSpec axisDcaZ{100, -1, 1, "DCA_{z} (cm)"};
+    const AxisSpec axisPt{settingsAxes.ptAxis, "#it{p}_{T} (GeV/#it{c})"};
+    const AxisSpec axisInvPt{settingsAxes.invPtDeltaAxis, "1/#it{p}_{T} (GeV/#it{c})^{-1}"};
+    const AxisSpec axisEta{settingsAxes.etaAxis, "#eta"};
+    const AxisSpec axisDcaXy{settingsAxes.dcaAxis, "DCA_{xy} (cm)"};
+    const AxisSpec axisDcaZ{settingsAxes.dcaAxis, "DCA_{z} (cm)"};
     const AxisSpec axisCovariancePtPt{100, 0, 10, "cov(#it{p}_{T}, #it{p}_{T}) ((GeV/#it{c})^{2})"};
     const AxisSpec axisCovarianceDcaXyDcaXy{100, 0, 1, "cov(DCA_{xy}, DCA_{xy}) (cm^{2})"};
     const AxisSpec axisCovarianceDcaZDcaZ{100, 0, 1, "cov(DCA_{z}, DCA_{z}) (cm^{2})"};
@@ -90,25 +105,26 @@ struct Alice3TrackingPerformance {
       const std::string tag = "_" + prefix;
       prefix += "/";
       auto histoName = [&](const std::string& name) { return Form("%s%s%s", prefix.c_str(), name.c_str(), tag.c_str()); };
-      particlePtDistribution[pdg] = histos.add<TH1>(histoName("particlePtDistribution"), "", kTH1D, {ptAxis});
+      particlePtDistribution[pdg] = histos.add<TH1>(histoName("particlePtDistribution"), "", kTH1D, {axisPt});
       LOG(info) << "Added histogram: " << histoName("particlePtDistribution");
-      particleEtaDistribution[pdg] = histos.add<TH1>(histoName("particleEtaDistribution"), "", kTH1D, {etaAxis});
-
-      ptDistribution[pdg] = histos.add<TH1>(histoName("ptDistribution"), "", kTH1D, {ptAxis});
-      ptResolutionVsPt[pdg] = histos.add<TH2>(histoName("ptResolutionVsPt"), "", kTH2D, {ptAxis, axisPtDelta});
-      ptResolutionVsEta[pdg] = histos.add<TProfile2D>(histoName("ptResolutionVsEta"), "", kTProfile2D, {ptAxis, etaAxis});
-      invPtResolutionVsPt[pdg] = histos.add<TH2>(histoName("invPtResolutionVsPt"), "", kTH2D, {ptAxis, invPtDeltaAxis});
-      invPtResolutionVsEta[pdg] = histos.add<TProfile2D>(histoName("invPtResolutionVsEta"), "", kTProfile2D, {ptAxis, etaAxis});
-      dcaXyResolutionVsPt[pdg] = histos.add<TH2>(histoName("dcaXyResolutionVsPt"), "", kTH2D, {ptAxis, axisDcaXy});
-      dcaZResolutionVsPt[pdg] = histos.add<TH2>(histoName("dcaZResolutionVsPt"), "", kTH2D, {ptAxis, axisDcaZ});
-      covariancePtPtVsPt[pdg] = histos.add<TH2>(histoName("covariancePtPtVsPt"), "", kTH2D, {ptAxis, axisCovariancePtPt});
-      covarianceDcaXyDcaXyVsPt[pdg] = histos.add<TH2>(histoName("covarianceDcaXyDcaXyVsPt"), "", kTH2D, {ptAxis, axisCovarianceDcaXyDcaXy});
-      covarianceDcaZDcaZVsPt[pdg] = histos.add<TH2>(histoName("covarianceDcaZDcaZVsPt"), "", kTH2D, {ptAxis, axisCovarianceDcaZDcaZ});
+      particleEtaDistribution[pdg] = histos.add<TH1>(histoName("particleEtaDistribution"), "", kTH1D, {axisEta});
+
+      ptDistribution[pdg] = histos.add<TH1>(histoName("ptDistribution"), "", kTH1D, {axisPt});
+      ptResolutionVsPt[pdg] = histos.add<TH2>(histoName("ptResolutionVsPt"), "", kTH2D, {axisPt, axisPtDelta});
+      ptResolutionVsEta[pdg] = histos.add<TProfile2D>(histoName("ptResolutionVsEta"), "", kTProfile2D, {axisPt, axisEta});
+      invPtResolutionVsPt[pdg] = histos.add<TH2>(histoName("invPtResolutionVsPt"), "", kTH2D, {axisPt, axisInvPt});
+      invPtResolutionVsEta[pdg] = histos.add<TProfile2D>(histoName("invPtResolutionVsEta"), "", kTProfile2D, {axisPt, axisEta});
+      dcaXyResolutionVsPt[pdg] = histos.add<TH2>(histoName("dcaXyResolutionVsPt"), "", kTH2D, {axisPt, axisDcaXy});
+      dcaZResolutionVsPt[pdg] = histos.add<TH2>(histoName("dcaZResolutionVsPt"), "", kTH2D, {axisPt, axisDcaZ});
+      covariancePtPtVsPt[pdg] = histos.add<TH2>(histoName("covariancePtPtVsPt"), "", kTH2D, {axisPt, axisCovariancePtPt});
+      covarianceDcaXyDcaXyVsPt[pdg] = histos.add<TH2>(histoName("covarianceDcaXyDcaXyVsPt"), "", kTH2D, {axisPt, axisCovarianceDcaXyDcaXy});
+      covarianceDcaZDcaZVsPt[pdg] = histos.add<TH2>(histoName("covarianceDcaZDcaZVsPt"), "", kTH2D, {axisPt, axisCovarianceDcaZDcaZ});
     }
   }
 
   void process(soa::Join<aod::Tracks, o2::aod::TracksCov, o2::aod::McTrackLabels, o2::aod::TracksDCA, o2::aod::TracksDCACov> const& tracks,
-               aod::McParticles const& mcParticles)
+               aod::McParticles const& mcParticles,
+               aod::McCollisions const&)
   {
     auto isParticleSelected = [&](const o2::aod::McParticle& p) {
       if (!p.isPhysicalPrimary()) {
@@ -119,6 +135,18 @@ struct Alice3TrackingPerformance {
     };
 
     for (const auto& mcParticle : mcParticles) {
+      // Selecting collisions
+      const auto& collision = mcParticle.mcCollision();
+      if (settingsSelections.vtxSelX >= 0.f && std::abs(collision.posX()) > settingsSelections.vtxSelX) {
+        continue;
+      }
+      if (settingsSelections.vtxSelY >= 0.f && std::abs(collision.posY()) > settingsSelections.vtxSelY) {
+        continue;
+      }
+      if (settingsSelections.vtxSelZ >= 0.f && std::abs(collision.posZ()) > settingsSelections.vtxSelZ) {
+        continue;
+      }
+
       particlePdgCodes->Fill(Form("%d", mcParticle.pdgCode()), 1);
       if (!isParticleSelected(mcParticle)) {
         continue;

Common/Core/FFitWeights.cxx

@@ -86,8 +86,8 @@ void FFitWeights::init()
   fW_data->Add(new TProfile("pMeanPt", "", centBin, 0, centBin));
   fW_data->Add(new TH2D("hPtWeight", "", centBin, 0, centBin, ptBin, ptAxis->GetXmin(), ptAxis->GetXmax()));
 
-  ptProfCent = reinterpret_cast<TProfile*>(fW_data->FindObject("pMeanPt"));
-  h2ptCent = reinterpret_cast<TH2D*>(fW_data->FindObject("hPtWeight"));
+  ptProfCent = dynamic_cast<TProfile*>(fW_data->FindObject("pMeanPt"));
+  h2ptCent = dynamic_cast<TH2D*>(fW_data->FindObject("hPtWeight"));
 };
 
 void FFitWeights::fillWeights(float centrality, float qn, int nh, const char* pf)
@@ -98,10 +98,10 @@ void FFitWeights::fillWeights(float centrality, float qn, int nh, const char* pf
   if (!tar)
     return;
 
-  TH2D* th2 = reinterpret_cast<TH2D*>(tar->FindObject(this->getQName(nh, pf)));
+  TH2D* th2 = dynamic_cast<TH2D*>(tar->FindObject(this->getQName(nh, pf)));
   if (!th2) {
     tar->Add(new TH2D(this->getQName(nh, pf), this->getAxisName(nh, pf), centBin, 0, centBin, qAxis->GetNbins(), qAxis->GetXmin(), qAxis->GetXmax()));
-    th2 = reinterpret_cast<TH2D*>(tar->At(tar->GetEntries() - 1));
+    th2 = dynamic_cast<TH2D*>(tar->At(tar->GetEntries() - 1));
   }
   th2->Fill(centrality, qn);
 };
@@ -117,7 +117,7 @@ void FFitWeights::fillPt(float centrality, float pt, float weight, bool first)
 float FFitWeights::getPtMult(float centrality)
 {
   if (!ptProfCent) {
-    ptProfCent = reinterpret_cast<TProfile*>(fW_data->FindObject("pMeanPt"));
+    ptProfCent = dynamic_cast<TProfile*>(fW_data->FindObject("pMeanPt"));
   }
   return ptProfCent->GetBinContent(ptProfCent->FindBin(centrality));
 };
@@ -132,7 +132,7 @@ Long64_t FFitWeights::Merge(TCollection* collist)
   }
   FFitWeights* lW = 0;
   TIter allW(collist);
-  while ((lW = (reinterpret_cast<FFitWeights*>(allW())))) {
+  while ((lW = (dynamic_cast<FFitWeights*>(allW())))) {
     addArray(fW_data, lW->getDataArray());
     nmerged++;
   }
@@ -150,7 +150,7 @@ void FFitWeights::addArray(TObjArray* targ, TObjArray* sour)
 
     auto* tObj = targ->FindObject(obj->GetName());
     if (!tObj) {
-      auto* clone = static_cast<TObject*>(obj->Clone(obj->GetName()));
+      auto* clone = obj->Clone(obj->GetName());
       if (auto* h = dynamic_cast<TH1*>(clone))
         h->SetDirectory(0);
       targ->Add(clone);
@@ -168,7 +168,7 @@ void FFitWeights::mptSel()
   if (!tar)
     return;
 
-  TH2D* th2 = reinterpret_cast<TH2D*>(tar->FindObject("hPtWeight"));
+  TH2D* th2 = dynamic_cast<TH2D*>(tar->FindObject("hPtWeight"));
   if (!th2) {
     return;
   }
@@ -198,7 +198,7 @@ void FFitWeights::qSelection(const std::vector<int>& nhv, const std::vector<std:
 
   for (const auto& pf : stv) {
     for (const auto& nh : nhv) {
-      TH2D* th2{reinterpret_cast<TH2D*>(tar->FindObject(this->getQName(nh, pf.c_str())))};
+      TH2D* th2{dynamic_cast<TH2D*>(tar->FindObject(this->getQName(nh, pf.c_str())))};
       if (!th2) {
         LOGF(info, "FFitWeights qh not found!");
         return;

Common/Core/PID/PIDTOFParamService.cxx

@@ -298,7 +298,7 @@ struct TOFSupport : o2::framework::ServicePlugin {
       },
       .configure = CommonServices::noConfiguration(),
       .exit = [](ServiceRegistryRef, void* service) {
-        auto* resp = reinterpret_cast<o2::pid::tof::TOFResponse*>(service);
+        auto* resp = static_cast<o2::pid::tof::TOFResponse*>(service);
         delete resp; },
       .kind = ServiceKind::Serial};
   }