Skip to content

[ALICE3] Remove HfHelper instances #18433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
njacazio merged 1 commit into from
Oct 23, 2026
Merged

[ALICE3] Remove HfHelper instances #18433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions ALICE3/TableProducer/alice3-correlatorDDbar.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
3 changes: 1 addition & 2 deletions ALICE3/TableProducer/alice3HfSelector3Prong.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down
6 changes: 2 additions & 4 deletions ALICE3/TableProducer/alice3HfTreeCreator3Prong.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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());
Expand Down
17 changes: 8 additions & 9 deletions ALICE3/Tasks/alice3HfTask3Prong.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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.);
Expand Down Expand Up @@ -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) {
Expand All @@ -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) {
Expand All @@ -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);
}
}
Expand All @@ -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();
Expand Down Expand Up @@ -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;
}
Expand Down
Loading