From ad6e1db50f0427996d59a7c3ae3370ffd7f9dd73 Mon Sep 17 00:00:00 2001 From: Shyam Kumar Date: Sun, 9 Nov 2025 15:48:00 +0100 Subject: [PATCH 01/11] Update correlatorDplusHadrons.cxx acceptance cut on D+ daughters as Run2 --- PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx b/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx index 87caae9a901..4141d0cb914 100644 --- a/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx +++ b/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx @@ -182,6 +182,7 @@ struct HfCorrelatorDplusHadrons { Produces entryDplus; Produces entryHadron; static constexpr std::size_t NDaughters{3u}; + static constexpr float kEtaDaughtersMax{0.8f}; // Eta cut on daughters of D+ meson as Run2 Configurable selectionFlagDplus{"selectionFlagDplus", 7, "Selection Flag for Dplus"}; // 7 corresponds to topo+PID cuts Configurable numberEventsMixed{"numberEventsMixed", 5, "Number of events mixed in ME process"}; @@ -577,13 +578,15 @@ struct HfCorrelatorDplusHadrons { listDaughters.clear(); RecoDecay::getDaughters(particle1, &listDaughters, arrDaughDplusPDG, 2); int counterDaughters = 0; - if (listDaughters.size() == NDaughters) { + if (listDaughters.size() != NDaughters) continue; + bool isDaughtersOk = true; for (const auto& dauIdx : listDaughters) { auto daughI = mcParticles.rawIteratorAt(dauIdx - mcParticles.offset()); + if (std::abs(daughI.eta()) >= kEtaDaughtersMax) { isDaughtersOk = false; break; } counterDaughters += 1; prongsId[counterDaughters - 1] = daughI.globalIndex(); } - } + if (!isDaughtersOk) continue; // Skip this D+ candidate if any daughter fails eta cut counterDplusHadron++; // Dplus Hadron correlation dedicated section // if it's a Dplus particle, search for Hadron and evaluate correlations From c23251965e2cfbbb6e0d8ff3442b7d6369533acb Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Sun, 9 Nov 2025 14:51:04 +0000 Subject: [PATCH 02/11] Please consider the following formatting changes --- .../TableProducer/correlatorDplusHadrons.cxx | 71 ++++++++++--------- 1 file changed, 38 insertions(+), 33 deletions(-) diff --git a/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx b/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx index 4141d0cb914..c2cb2b20f80 100644 --- a/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx +++ b/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx @@ -578,44 +578,49 @@ struct HfCorrelatorDplusHadrons { listDaughters.clear(); RecoDecay::getDaughters(particle1, &listDaughters, arrDaughDplusPDG, 2); int counterDaughters = 0; - if (listDaughters.size() != NDaughters) continue; - bool isDaughtersOk = true; - for (const auto& dauIdx : listDaughters) { - auto daughI = mcParticles.rawIteratorAt(dauIdx - mcParticles.offset()); - if (std::abs(daughI.eta()) >= kEtaDaughtersMax) { isDaughtersOk = false; break; } - counterDaughters += 1; - prongsId[counterDaughters - 1] = daughI.globalIndex(); + if (listDaughters.size() != NDaughters) + continue; + bool isDaughtersOk = true; + for (const auto& dauIdx : listDaughters) { + auto daughI = mcParticles.rawIteratorAt(dauIdx - mcParticles.offset()); + if (std::abs(daughI.eta()) >= kEtaDaughtersMax) { + isDaughtersOk = false; + break; } - if (!isDaughtersOk) continue; // Skip this D+ candidate if any daughter fails eta cut - counterDplusHadron++; - // Dplus Hadron correlation dedicated section - // if it's a Dplus particle, search for Hadron and evaluate correlations - registry.fill(HIST("hcountDplustriggersMCGen"), 0, particle1.pt()); // to count trigger Dplus for normalisation) - for (const auto& particleAssoc : mcParticles) { - if (std::abs(particleAssoc.eta()) > etaTrackMax || particleAssoc.pt() < ptTrackMin || particleAssoc.pt() > ptTrackMax) { - continue; + counterDaughters += 1; + prongsId[counterDaughters - 1] = daughI.globalIndex(); } - if (removeDaughters) { - if (particleAssoc.globalIndex() == prongsId[0] || particleAssoc.globalIndex() == prongsId[1] || particleAssoc.globalIndex() == prongsId[2]) { + if (!isDaughtersOk) + continue; // Skip this D+ candidate if any daughter fails eta cut + counterDplusHadron++; + // Dplus Hadron correlation dedicated section + // if it's a Dplus particle, search for Hadron and evaluate correlations + registry.fill(HIST("hcountDplustriggersMCGen"), 0, particle1.pt()); // to count trigger Dplus for normalisation) + for (const auto& particleAssoc : mcParticles) { + if (std::abs(particleAssoc.eta()) > etaTrackMax || particleAssoc.pt() < ptTrackMin || particleAssoc.pt() > ptTrackMax) { + continue; + } + if (removeDaughters) { + if (particleAssoc.globalIndex() == prongsId[0] || particleAssoc.globalIndex() == prongsId[1] || particleAssoc.globalIndex() == prongsId[2]) { + continue; + } + } + if ((std::abs(particleAssoc.pdgCode()) != kElectron) && (std::abs(particleAssoc.pdgCode()) != kMuonMinus) && (std::abs(particleAssoc.pdgCode()) != kPiPlus) && (std::abs(particleAssoc.pdgCode()) != kKPlus) && (std::abs(particleAssoc.pdgCode()) != kProton)) { + continue; + } + if (!particleAssoc.isPhysicalPrimary()) { continue; } - } - if ((std::abs(particleAssoc.pdgCode()) != kElectron) && (std::abs(particleAssoc.pdgCode()) != kMuonMinus) && (std::abs(particleAssoc.pdgCode()) != kPiPlus) && (std::abs(particleAssoc.pdgCode()) != kKPlus) && (std::abs(particleAssoc.pdgCode()) != kProton)) { - continue; - } - if (!particleAssoc.isPhysicalPrimary()) { - continue; - } - int trackOrigin = RecoDecay::getCharmHadronOrigin(mcParticles, particleAssoc, true); - registry.fill(HIST("hPtParticleAssocMcGen"), particleAssoc.pt()); - entryDplusHadronPair(getDeltaPhi(particleAssoc.phi(), particle1.phi()), - particleAssoc.eta() - particle1.eta(), - particle1.pt(), - particleAssoc.pt(), - poolBin); - entryDplusHadronRecoInfo(MassDPlus, true); - entryDplusHadronGenInfo(isDplusPrompt, particleAssoc.isPhysicalPrimary(), trackOrigin); + int trackOrigin = RecoDecay::getCharmHadronOrigin(mcParticles, particleAssoc, true); + registry.fill(HIST("hPtParticleAssocMcGen"), particleAssoc.pt()); + entryDplusHadronPair(getDeltaPhi(particleAssoc.phi(), particle1.phi()), + particleAssoc.eta() - particle1.eta(), + particle1.pt(), + particleAssoc.pt(), + poolBin); + entryDplusHadronRecoInfo(MassDPlus, true); + entryDplusHadronGenInfo(isDplusPrompt, particleAssoc.isPhysicalPrimary(), trackOrigin); } // end associated loop } // end trigger registry.fill(HIST("hcountDplusHadronPerEvent"), counterDplusHadron); From c63f71ed37b505e82e08d8fe5f0853b7d17fe578 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Sun, 9 Nov 2025 14:55:10 +0000 Subject: [PATCH 03/11] Please consider the following formatting changes --- .../TableProducer/correlatorDplusHadrons.cxx | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx b/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx index c2cb2b20f80..27fff1c67f9 100644 --- a/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx +++ b/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx @@ -589,38 +589,38 @@ struct HfCorrelatorDplusHadrons { } counterDaughters += 1; prongsId[counterDaughters - 1] = daughI.globalIndex(); + } + if (!isDaughtersOk) + continue; // Skip this D+ candidate if any daughter fails eta cut + counterDplusHadron++; + // Dplus Hadron correlation dedicated section + // if it's a Dplus particle, search for Hadron and evaluate correlations + registry.fill(HIST("hcountDplustriggersMCGen"), 0, particle1.pt()); // to count trigger Dplus for normalisation) + for (const auto& particleAssoc : mcParticles) { + if (std::abs(particleAssoc.eta()) > etaTrackMax || particleAssoc.pt() < ptTrackMin || particleAssoc.pt() > ptTrackMax) { + continue; } - if (!isDaughtersOk) - continue; // Skip this D+ candidate if any daughter fails eta cut - counterDplusHadron++; - // Dplus Hadron correlation dedicated section - // if it's a Dplus particle, search for Hadron and evaluate correlations - registry.fill(HIST("hcountDplustriggersMCGen"), 0, particle1.pt()); // to count trigger Dplus for normalisation) - for (const auto& particleAssoc : mcParticles) { - if (std::abs(particleAssoc.eta()) > etaTrackMax || particleAssoc.pt() < ptTrackMin || particleAssoc.pt() > ptTrackMax) { - continue; - } - if (removeDaughters) { - if (particleAssoc.globalIndex() == prongsId[0] || particleAssoc.globalIndex() == prongsId[1] || particleAssoc.globalIndex() == prongsId[2]) { - continue; - } - } - if ((std::abs(particleAssoc.pdgCode()) != kElectron) && (std::abs(particleAssoc.pdgCode()) != kMuonMinus) && (std::abs(particleAssoc.pdgCode()) != kPiPlus) && (std::abs(particleAssoc.pdgCode()) != kKPlus) && (std::abs(particleAssoc.pdgCode()) != kProton)) { - continue; - } - if (!particleAssoc.isPhysicalPrimary()) { + if (removeDaughters) { + if (particleAssoc.globalIndex() == prongsId[0] || particleAssoc.globalIndex() == prongsId[1] || particleAssoc.globalIndex() == prongsId[2]) { continue; } + } + if ((std::abs(particleAssoc.pdgCode()) != kElectron) && (std::abs(particleAssoc.pdgCode()) != kMuonMinus) && (std::abs(particleAssoc.pdgCode()) != kPiPlus) && (std::abs(particleAssoc.pdgCode()) != kKPlus) && (std::abs(particleAssoc.pdgCode()) != kProton)) { + continue; + } + if (!particleAssoc.isPhysicalPrimary()) { + continue; + } - int trackOrigin = RecoDecay::getCharmHadronOrigin(mcParticles, particleAssoc, true); - registry.fill(HIST("hPtParticleAssocMcGen"), particleAssoc.pt()); - entryDplusHadronPair(getDeltaPhi(particleAssoc.phi(), particle1.phi()), - particleAssoc.eta() - particle1.eta(), - particle1.pt(), - particleAssoc.pt(), - poolBin); - entryDplusHadronRecoInfo(MassDPlus, true); - entryDplusHadronGenInfo(isDplusPrompt, particleAssoc.isPhysicalPrimary(), trackOrigin); + int trackOrigin = RecoDecay::getCharmHadronOrigin(mcParticles, particleAssoc, true); + registry.fill(HIST("hPtParticleAssocMcGen"), particleAssoc.pt()); + entryDplusHadronPair(getDeltaPhi(particleAssoc.phi(), particle1.phi()), + particleAssoc.eta() - particle1.eta(), + particle1.pt(), + particleAssoc.pt(), + poolBin); + entryDplusHadronRecoInfo(MassDPlus, true); + entryDplusHadronGenInfo(isDplusPrompt, particleAssoc.isPhysicalPrimary(), trackOrigin); } // end associated loop } // end trigger registry.fill(HIST("hcountDplusHadronPerEvent"), counterDplusHadron); From d4348b6f9e0a923b5594e3e551ea02308a31b9d3 Mon Sep 17 00:00:00 2001 From: Shyam Kumar Date: Mon, 10 Nov 2025 11:32:57 +0100 Subject: [PATCH 04/11] Update correlatorDplusHadrons.cxx --- PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx b/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx index 27fff1c67f9..409eece49c2 100644 --- a/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx +++ b/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx @@ -494,6 +494,13 @@ struct HfCorrelatorDplusHadrons { if (!track.isGlobalTrackWoDCA()) { continue; } + // Removing Dplus daughters for which |eta|>0.8 + double etaDaugh1 = RecoDecay::eta(std::array{candidate.pxProng0(), candidate.pyProng0(), candidate.pzProng0()}); + double etaDaugh2 = RecoDecay::eta(std::array{candidate.pxProng1(), candidate.pyProng1(), candidate.pzProng1()}); + double etaDaugh3 = RecoDecay::eta(std::array{candidate.pxProng2(), candidate.pyProng2(), candidate.pzProng2()}); + if (std::abs(etaDaugh1) >= kEtaDaughtersMax || std::abs(etaDaugh2) >= kEtaDaughtersMax || std::abs(etaDaugh3) >= kEtaDaughtersMax) { + continue; + } // Removing Dplus daughters by checking track indices if (removeDaughters) { if ((candidate.prong0Id() == track.globalIndex()) || (candidate.prong1Id() == track.globalIndex()) || (candidate.prong2Id() == track.globalIndex())) { From b84f40204391a63dabcb0a2ccce8a473aca541c0 Mon Sep 17 00:00:00 2001 From: Shyam Kumar Date: Mon, 10 Nov 2025 11:40:44 +0100 Subject: [PATCH 05/11] Update correlatorDplusHadrons.cxx Updated message --- PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx b/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx index 409eece49c2..033433aa0b7 100644 --- a/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx +++ b/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx @@ -494,7 +494,7 @@ struct HfCorrelatorDplusHadrons { if (!track.isGlobalTrackWoDCA()) { continue; } - // Removing Dplus daughters for which |eta|>0.8 + // Remove D+ candidates for which at least one daughter has |eta| > 0.8 double etaDaugh1 = RecoDecay::eta(std::array{candidate.pxProng0(), candidate.pyProng0(), candidate.pzProng0()}); double etaDaugh2 = RecoDecay::eta(std::array{candidate.pxProng1(), candidate.pyProng1(), candidate.pzProng1()}); double etaDaugh3 = RecoDecay::eta(std::array{candidate.pxProng2(), candidate.pyProng2(), candidate.pzProng2()}); From a0ea4334236c141af223173e9996642dfa8130ab Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Mon, 10 Nov 2025 10:41:26 +0000 Subject: [PATCH 06/11] Please consider the following formatting changes --- PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx b/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx index 033433aa0b7..7fa533dbbd2 100644 --- a/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx +++ b/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx @@ -498,8 +498,8 @@ struct HfCorrelatorDplusHadrons { double etaDaugh1 = RecoDecay::eta(std::array{candidate.pxProng0(), candidate.pyProng0(), candidate.pzProng0()}); double etaDaugh2 = RecoDecay::eta(std::array{candidate.pxProng1(), candidate.pyProng1(), candidate.pzProng1()}); double etaDaugh3 = RecoDecay::eta(std::array{candidate.pxProng2(), candidate.pyProng2(), candidate.pzProng2()}); - if (std::abs(etaDaugh1) >= kEtaDaughtersMax || std::abs(etaDaugh2) >= kEtaDaughtersMax || std::abs(etaDaugh3) >= kEtaDaughtersMax) { - continue; + if (std::abs(etaDaugh1) >= kEtaDaughtersMax || std::abs(etaDaugh2) >= kEtaDaughtersMax || std::abs(etaDaugh3) >= kEtaDaughtersMax) { + continue; } // Removing Dplus daughters by checking track indices if (removeDaughters) { From cf0658d1b3f059284fe0af258ea31dfa8ac3e4ac Mon Sep 17 00:00:00 2001 From: Shyam Kumar Date: Mon, 10 Nov 2025 11:56:56 +0100 Subject: [PATCH 07/11] Update correlatorDplusHadrons.cxx --- .../HFC/TableProducer/correlatorDplusHadrons.cxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx b/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx index 7fa533dbbd2..b07972ddaf2 100644 --- a/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx +++ b/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx @@ -433,6 +433,13 @@ struct HfCorrelatorDplusHadrons { if (std::abs(HfHelper::yDplus(candidate)) >= yCandMax || candidate.pt() <= ptCandMin || candidate.pt() >= ptCandMax) { continue; } + // Remove D+ candidates for which at least one daughter has |eta| > 0.8 + double etaDaugh1 = RecoDecay::eta(std::array{candidate.pxProng0(), candidate.pyProng0(), candidate.pzProng0()}); + double etaDaugh2 = RecoDecay::eta(std::array{candidate.pxProng1(), candidate.pyProng1(), candidate.pzProng1()}); + double etaDaugh3 = RecoDecay::eta(std::array{candidate.pxProng2(), candidate.pyProng2(), candidate.pzProng2()}); + if (std::abs(etaDaugh1) >= kEtaDaughtersMax || std::abs(etaDaugh2) >= kEtaDaughtersMax || std::abs(etaDaugh3) >= kEtaDaughtersMax) { + continue; + } // efficiency weight determination int const effBinD = o2::analysis::findBin(binsPtEfficiencyD, candidate.pt()); double efficiencyWeightD = 1.; @@ -494,14 +501,7 @@ struct HfCorrelatorDplusHadrons { if (!track.isGlobalTrackWoDCA()) { continue; } - // Remove D+ candidates for which at least one daughter has |eta| > 0.8 - double etaDaugh1 = RecoDecay::eta(std::array{candidate.pxProng0(), candidate.pyProng0(), candidate.pzProng0()}); - double etaDaugh2 = RecoDecay::eta(std::array{candidate.pxProng1(), candidate.pyProng1(), candidate.pzProng1()}); - double etaDaugh3 = RecoDecay::eta(std::array{candidate.pxProng2(), candidate.pyProng2(), candidate.pzProng2()}); - if (std::abs(etaDaugh1) >= kEtaDaughtersMax || std::abs(etaDaugh2) >= kEtaDaughtersMax || std::abs(etaDaugh3) >= kEtaDaughtersMax) { - continue; - } - // Removing Dplus daughters by checking track indices + // Removing Dplus daughters by checking track indices if (removeDaughters) { if ((candidate.prong0Id() == track.globalIndex()) || (candidate.prong1Id() == track.globalIndex()) || (candidate.prong2Id() == track.globalIndex())) { continue; From a8a8173df991a71526a2368f51f7de3bce8848dd Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Mon, 10 Nov 2025 10:57:29 +0000 Subject: [PATCH 08/11] Please consider the following formatting changes --- PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx b/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx index b07972ddaf2..603d3a597e3 100644 --- a/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx +++ b/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx @@ -433,12 +433,12 @@ struct HfCorrelatorDplusHadrons { if (std::abs(HfHelper::yDplus(candidate)) >= yCandMax || candidate.pt() <= ptCandMin || candidate.pt() >= ptCandMax) { continue; } - // Remove D+ candidates for which at least one daughter has |eta| > 0.8 - double etaDaugh1 = RecoDecay::eta(std::array{candidate.pxProng0(), candidate.pyProng0(), candidate.pzProng0()}); - double etaDaugh2 = RecoDecay::eta(std::array{candidate.pxProng1(), candidate.pyProng1(), candidate.pzProng1()}); - double etaDaugh3 = RecoDecay::eta(std::array{candidate.pxProng2(), candidate.pyProng2(), candidate.pzProng2()}); - if (std::abs(etaDaugh1) >= kEtaDaughtersMax || std::abs(etaDaugh2) >= kEtaDaughtersMax || std::abs(etaDaugh3) >= kEtaDaughtersMax) { - continue; + // Remove D+ candidates for which at least one daughter has |eta| > 0.8 + double etaDaugh1 = RecoDecay::eta(std::array{candidate.pxProng0(), candidate.pyProng0(), candidate.pzProng0()}); + double etaDaugh2 = RecoDecay::eta(std::array{candidate.pxProng1(), candidate.pyProng1(), candidate.pzProng1()}); + double etaDaugh3 = RecoDecay::eta(std::array{candidate.pxProng2(), candidate.pyProng2(), candidate.pzProng2()}); + if (std::abs(etaDaugh1) >= kEtaDaughtersMax || std::abs(etaDaugh2) >= kEtaDaughtersMax || std::abs(etaDaugh3) >= kEtaDaughtersMax) { + continue; } // efficiency weight determination int const effBinD = o2::analysis::findBin(binsPtEfficiencyD, candidate.pt()); @@ -501,7 +501,7 @@ struct HfCorrelatorDplusHadrons { if (!track.isGlobalTrackWoDCA()) { continue; } - // Removing Dplus daughters by checking track indices + // Removing Dplus daughters by checking track indices if (removeDaughters) { if ((candidate.prong0Id() == track.globalIndex()) || (candidate.prong1Id() == track.globalIndex()) || (candidate.prong2Id() == track.globalIndex())) { continue; From c1157725c062fc19ca6d700b09760632c1cf52f0 Mon Sep 17 00:00:00 2001 From: Shyam Kumar Date: Mon, 10 Nov 2025 12:18:07 +0100 Subject: [PATCH 09/11] Update correlatorDplusHadrons.cxx Fix for O2linter warning --- .../HFC/TableProducer/correlatorDplusHadrons.cxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx b/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx index 603d3a597e3..76250edd647 100644 --- a/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx +++ b/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx @@ -171,7 +171,7 @@ struct HfCorrelatorDplusHadronsDplusSelection { }; /// Dplus-Hadron correlation pair builder - for real data and data-like analysis (i.e. reco-level w/o matching request via MC truth) -struct HfCorrelatorDplusHadrons { +struct CorrelatorDplusHadrons { Produces entryDplusHadronPair; Produces entryDplusHadronRecoInfo; Produces entryDplusHadronMlInfo; @@ -397,7 +397,7 @@ struct HfCorrelatorDplusHadrons { registry.fill(HIST("hMultFT0M"), collision.multFT0M()); } } - PROCESS_SWITCH(HfCorrelatorDplusHadrons, processData, "Process data", false); + PROCESS_SWITCH(CorrelatorDplusHadrons, processData, "Process data", false); /// Dplus-Hadron correlation pair builder - for MC reco-level analysis (candidates matched to true signal only, but also the various bkg sources are studied) void processMcRec(SelCollisionsWithDplus::iterator const& collision, @@ -535,7 +535,7 @@ struct HfCorrelatorDplusHadrons { registry.fill(HIST("hMultFT0M"), collision.multFT0M()); } } - PROCESS_SWITCH(HfCorrelatorDplusHadrons, processMcRec, "Process MC Reco mode", true); + PROCESS_SWITCH(CorrelatorDplusHadrons, processMcRec, "Process MC Reco mode", true); /// Dplus-Hadron correlation pair builder - for MC gen-level analysis (no filter/selection, only true signal) void processMcGen(SelCollisionsWithDplusMc::iterator const& mcCollision, @@ -634,7 +634,7 @@ struct HfCorrelatorDplusHadrons { registry.fill(HIST("hZvtx"), mcCollision.posZ()); // registry.fill(HIST("hMultiplicity"), getTracksSize(mcCollision)); } - PROCESS_SWITCH(HfCorrelatorDplusHadrons, processMcGen, "Process MC Gen mode", false); + PROCESS_SWITCH(CorrelatorDplusHadrons, processMcGen, "Process MC Gen mode", false); void processDataMixedEvent(SelCollisionsWithDplus const& collisions, CandidatesDplusData const& candidates, @@ -656,7 +656,7 @@ struct HfCorrelatorDplusHadrons { } } } - PROCESS_SWITCH(HfCorrelatorDplusHadrons, processDataMixedEvent, "Process Mixed Event Data", false); + PROCESS_SWITCH(CorrelatorDplusHadrons, processDataMixedEvent, "Process Mixed Event Data", false); void processMcRecMixedEvent(SelCollisionsWithDplus const& collisions, CandidatesDplusMcRec const& candidates, @@ -732,7 +732,7 @@ struct HfCorrelatorDplusHadrons { } } } - PROCESS_SWITCH(HfCorrelatorDplusHadrons, processMcRecMixedEvent, "Process Mixed Event MCRec", false); + PROCESS_SWITCH(CorrelatorDplusHadrons, processMcRecMixedEvent, "Process Mixed Event MCRec", false); void processMcGenMixedEvent(SelCollisionsWithDplusMc const& collisions, CandDplusMcGen const& mcParticles) @@ -771,11 +771,11 @@ struct HfCorrelatorDplusHadrons { } } } - PROCESS_SWITCH(HfCorrelatorDplusHadrons, processMcGenMixedEvent, "Process Mixed Event MCGen", false); + PROCESS_SWITCH(CorrelatorDplusHadrons, processMcGenMixedEvent, "Process Mixed Event MCGen", false); }; WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) { return WorkflowSpec{adaptAnalysisTask(cfgc), - adaptAnalysisTask(cfgc)}; + adaptAnalysisTask(cfgc)}; } From aff1c7e92c4346ba321ed4cb4da347d9f0ffdd8a Mon Sep 17 00:00:00 2001 From: Shyam Kumar Date: Mon, 10 Nov 2025 12:31:07 +0100 Subject: [PATCH 10/11] Update correlatorDplusHadrons.cxx Fixing O2linter warning --- .../TableProducer/correlatorDplusHadrons.cxx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx b/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx index 76250edd647..01816ccaee5 100644 --- a/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx +++ b/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx @@ -171,7 +171,7 @@ struct HfCorrelatorDplusHadronsDplusSelection { }; /// Dplus-Hadron correlation pair builder - for real data and data-like analysis (i.e. reco-level w/o matching request via MC truth) -struct CorrelatorDplusHadrons { +struct HfCorrelatorDplusHadrons { Produces entryDplusHadronPair; Produces entryDplusHadronRecoInfo; Produces entryDplusHadronMlInfo; @@ -182,7 +182,7 @@ struct CorrelatorDplusHadrons { Produces entryDplus; Produces entryHadron; static constexpr std::size_t NDaughters{3u}; - static constexpr float kEtaDaughtersMax{0.8f}; // Eta cut on daughters of D+ meson as Run2 + static const float kEtaDaughtersMax{0.8f}; // Eta cut on daughters of D+ meson as Run2 Configurable selectionFlagDplus{"selectionFlagDplus", 7, "Selection Flag for Dplus"}; // 7 corresponds to topo+PID cuts Configurable numberEventsMixed{"numberEventsMixed", 5, "Number of events mixed in ME process"}; @@ -397,7 +397,7 @@ struct CorrelatorDplusHadrons { registry.fill(HIST("hMultFT0M"), collision.multFT0M()); } } - PROCESS_SWITCH(CorrelatorDplusHadrons, processData, "Process data", false); + PROCESS_SWITCH(HfCorrelatorDplusHadrons, processData, "Process data", false); /// Dplus-Hadron correlation pair builder - for MC reco-level analysis (candidates matched to true signal only, but also the various bkg sources are studied) void processMcRec(SelCollisionsWithDplus::iterator const& collision, @@ -535,7 +535,7 @@ struct CorrelatorDplusHadrons { registry.fill(HIST("hMultFT0M"), collision.multFT0M()); } } - PROCESS_SWITCH(CorrelatorDplusHadrons, processMcRec, "Process MC Reco mode", true); + PROCESS_SWITCH(HfCorrelatorDplusHadrons, processMcRec, "Process MC Reco mode", true); /// Dplus-Hadron correlation pair builder - for MC gen-level analysis (no filter/selection, only true signal) void processMcGen(SelCollisionsWithDplusMc::iterator const& mcCollision, @@ -634,7 +634,7 @@ struct CorrelatorDplusHadrons { registry.fill(HIST("hZvtx"), mcCollision.posZ()); // registry.fill(HIST("hMultiplicity"), getTracksSize(mcCollision)); } - PROCESS_SWITCH(CorrelatorDplusHadrons, processMcGen, "Process MC Gen mode", false); + PROCESS_SWITCH(HfCorrelatorDplusHadrons, processMcGen, "Process MC Gen mode", false); void processDataMixedEvent(SelCollisionsWithDplus const& collisions, CandidatesDplusData const& candidates, @@ -656,7 +656,7 @@ struct CorrelatorDplusHadrons { } } } - PROCESS_SWITCH(CorrelatorDplusHadrons, processDataMixedEvent, "Process Mixed Event Data", false); + PROCESS_SWITCH(HfCorrelatorDplusHadrons, processDataMixedEvent, "Process Mixed Event Data", false); void processMcRecMixedEvent(SelCollisionsWithDplus const& collisions, CandidatesDplusMcRec const& candidates, @@ -732,7 +732,7 @@ struct CorrelatorDplusHadrons { } } } - PROCESS_SWITCH(CorrelatorDplusHadrons, processMcRecMixedEvent, "Process Mixed Event MCRec", false); + PROCESS_SWITCH(HfCorrelatorDplusHadrons, processMcRecMixedEvent, "Process Mixed Event MCRec", false); void processMcGenMixedEvent(SelCollisionsWithDplusMc const& collisions, CandDplusMcGen const& mcParticles) @@ -771,11 +771,11 @@ struct CorrelatorDplusHadrons { } } } - PROCESS_SWITCH(CorrelatorDplusHadrons, processMcGenMixedEvent, "Process Mixed Event MCGen", false); + PROCESS_SWITCH(HfCorrelatorDplusHadrons, processMcGenMixedEvent, "Process Mixed Event MCGen", false); }; WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) { return WorkflowSpec{adaptAnalysisTask(cfgc), - adaptAnalysisTask(cfgc)}; + adaptAnalysisTask(cfgc)}; } From 4cb1fe4a17a5f29e983fa8ae536850fbdcb0809b Mon Sep 17 00:00:00 2001 From: Shyam Kumar Date: Mon, 10 Nov 2025 16:48:15 +0100 Subject: [PATCH 11/11] Update correlatorDplusHadrons.cxx Minor fix in float expression. --- PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx b/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx index 01816ccaee5..eb81d093ec9 100644 --- a/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx +++ b/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx @@ -182,7 +182,7 @@ struct HfCorrelatorDplusHadrons { Produces entryDplus; Produces entryHadron; static constexpr std::size_t NDaughters{3u}; - static const float kEtaDaughtersMax{0.8f}; // Eta cut on daughters of D+ meson as Run2 + static constexpr float kEtaDaughtersMax = 0.8f; // Eta cut on daughters of D+ meson as Run2 Configurable selectionFlagDplus{"selectionFlagDplus", 7, "Selection Flag for Dplus"}; // 7 corresponds to topo+PID cuts Configurable numberEventsMixed{"numberEventsMixed", 5, "Number of events mixed in ME process"};