Skip to content

[PWGDQ] Setup prompt non prompt separation table #18527

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
axti98 merged 7 commits into from
Oct 31, 2026
Merged

[PWGDQ] Setup prompt non prompt separation table #18527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8646f4e
Reset and fill the event properties in the runMCGen
JonathanWitte Oct 30, 2026
fc534ac
Add new variables for prompt non prompt separation, calculate them in…
JonathanWitte Oct 30, 2026
4bb368e
Removing whitespace
axti98 Oct 30, 2026
9f9c6a8
Remove whitespace
axti98 Oct 30, 2026
d57c953
Remove whitespace
axti98 Oct 30, 2026
c5e6048
Import clang-format change
axti98 Oct 30, 2026
55571a9
Import clang-format change
axti98 Oct 30, 2026
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
12 changes: 12 additions & 0 deletions PWGDQ/Core/VarManager.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1131,6 +1131,14 @@ void VarManager::SetDefaultVarNames()
fgVariableUnits[kDCAxy2] = "cm";
fgVariableNames[kDCAz2] = "DCA_{z}";
fgVariableUnits[kDCAz2] = "cm";
fgVariableNames[kDCAxyOverSig1] = "DCA_{xy}/#sigma_{DCA_{xy}}";
fgVariableUnits[kDCAxyOverSig1] = "";
fgVariableNames[kDCAzOverSig1] = "DCA_{z}/#sigma_{DCA_{z}}";
fgVariableUnits[kDCAzOverSig1] = "";
fgVariableNames[kDCAxyOverSig2] = "DCA_{xy}/#sigma_{DCA_{xy}}";
fgVariableUnits[kDCAxyOverSig2] = "";
fgVariableNames[kDCAzOverSig2] = "DCA_{z}/#sigma_{DCA_{z}}";
fgVariableUnits[kDCAzOverSig2] = "";
fgVariableNames[kTPCnSigmaEl] = "n #sigma_{e}^{TPC}";
fgVariableUnits[kTPCnSigmaEl] = "";
fgVariableNames[kTPCnSigmaEl_Corr] = "n #sigma_{e}^{TPC} Corr.";
Expand Down Expand Up @@ -2358,6 +2366,8 @@ void VarManager::SetDefaultVarNames()
fgVarNamesMap["kCharge1"] = kCharge1;
fgVarNamesMap["kDCAxy1"] = kDCAxy1;
fgVarNamesMap["kDCAz1"] = kDCAz1;
fgVarNamesMap["kDCAxyOverSig1"] = kDCAxyOverSig1;
fgVarNamesMap["kDCAzOverSig1"] = kDCAzOverSig1;
fgVarNamesMap["kITSclusterMap1"] = kITSclusterMap1;
fgVarNamesMap["kTPCnSigmaEl1"] = kTPCnSigmaEl1;
fgVarNamesMap["kPin_leg1"] = kPin_leg1;
Expand All @@ -2368,6 +2378,8 @@ void VarManager::SetDefaultVarNames()
fgVarNamesMap["kCharge2"] = kCharge2;
fgVarNamesMap["kDCAxy2"] = kDCAxy2;
fgVarNamesMap["kDCAz2"] = kDCAz2;
fgVarNamesMap["kDCAxyOverSig2"] = kDCAxyOverSig2;
fgVarNamesMap["kDCAzOverSig2"] = kDCAzOverSig2;
fgVarNamesMap["kITSclusterMap2"] = kITSclusterMap2;
fgVarNamesMap["kTPCnSigmaEl2"] = kTPCnSigmaEl2;
fgVarNamesMap["kPin"] = kPin;
Expand Down
23 changes: 17 additions & 6 deletions PWGDQ/Core/VarManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,8 @@ class VarManager : public TObject
kCharge1,
kDCAxy1,
kDCAz1,
kDCAxyOverSig1,
kDCAzOverSig1,
kITSclusterMap1,
kTPCnSigmaEl1,
kPin_leg1,
Expand All @@ -568,6 +570,8 @@ class VarManager : public TObject
kCharge2,
kDCAxy2,
kDCAz2,
kDCAxyOverSig2,
kDCAzOverSig2,
kITSclusterMap2,
kTPCnSigmaEl2,

Expand Down Expand Up @@ -4024,14 +4028,18 @@ void VarManager::FillPair(T1 const& t1, T2 const& t2, float* values)
values[kDCAxy2] = dca2XY;
values[kDCAz2] = dca2Z;

if (fgUsedVars[kQuadDCAabsXY] || fgUsedVars[kQuadDCAsigXY] || fgUsedVars[kQuadDCAabsZ] || fgUsedVars[kQuadDCAsigZ] || fgUsedVars[kQuadDCAsigXYZ] || fgUsedVars[kSignQuadDCAsigXY]) {
// Quantities based on the barrel tables
double dca1sigXY = dca1XY / std::sqrt(t1.cYY());
double dca2sigXY = dca2XY / std::sqrt(t2.cYY());
double dca1sigZ = dca1Z / std::sqrt(t1.cZZ());
double dca2sigZ = dca2Z / std::sqrt(t2.cZZ());

double dca1sigXY = dca1XY / std::sqrt(t1.cYY());
double dca2sigXY = dca2XY / std::sqrt(t2.cYY());
double dca1sigZ = dca1Z / std::sqrt(t1.cZZ());
double dca2sigZ = dca2Z / std::sqrt(t2.cZZ());
values[kDCAxyOverSig1] = dca1sigXY;
values[kDCAzOverSig1] = dca1sigZ;
values[kDCAxyOverSig2] = dca2sigXY;
values[kDCAzOverSig2] = dca2sigZ;

if (fgUsedVars[kQuadDCAabsXY] || fgUsedVars[kQuadDCAsigXY] || fgUsedVars[kQuadDCAabsZ] || fgUsedVars[kQuadDCAsigZ] || fgUsedVars[kQuadDCAsigXYZ] || fgUsedVars[kSignQuadDCAsigXY]) {
// Quantities based on the barrel tables
values[kQuadDCAabsXY] = std::sqrt((dca1XY * dca1XY + dca2XY * dca2XY) / 2);
values[kQuadDCAsigXY] = std::sqrt((dca1sigXY * dca1sigXY + dca2sigXY * dca2sigXY) / 2);
values[kQuadDCAabsZ] = std::sqrt((dca1Z * dca1Z + dca2Z * dca2Z) / 2);
Expand Down Expand Up @@ -5023,6 +5031,9 @@ void VarManager::FillPairVertexing(C const& collision, T const& t1, T const& t2,
values[kVertexingLxyErr] = -999.;
values[kVertexingLxyzErr] = -999.;
values[kVertexingLzErr] = -999.;
values[kVertexingLxyOverErr] = -999.;
values[kVertexingLzOverErr] = -999.;
values[kVertexingLxyzOverErr] = -999.;

values[kVertexingTauxy] = -999.;
values[kVertexingTauz] = -999.;
Expand Down
69 changes: 56 additions & 13 deletions PWGDQ/Tasks/dqEfficiency_withAssoc.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@ DECLARE_SOA_COLUMN(Etaee, etaee, float);
DECLARE_SOA_COLUMN(Rapee, rapee, float);
DECLARE_SOA_COLUMN(Phiee, phiee, float);
DECLARE_SOA_COLUMN(Ptee, ptee, float);
DECLARE_SOA_COLUMN(Lxyee, lxyee, float);
DECLARE_SOA_COLUMN(LxyeePoleMass, lxyeepolemass, float);
DECLARE_SOA_COLUMN(Lxyee, lxyJPsi2ee, float);
DECLARE_SOA_COLUMN(LxyeePoleMass, lxyJPsi2eePoleMass, float);
DECLARE_SOA_COLUMN(Lzee, lzee, float);
DECLARE_SOA_COLUMN(LxyeePoleMassPVrecomputed, lxyeePoleMassPVrecomputed, float);
DECLARE_SOA_COLUMN(Vx, vx, float);
Expand All @@ -178,10 +178,26 @@ DECLARE_SOA_COLUMN(DcaZ2, dcaZ2, float);
DECLARE_SOA_COLUMN(MultiplicityFT0A, multiplicityFT0AJPsi2ee, float);
DECLARE_SOA_COLUMN(MultiplicityFT0C, multiplicityFT0CJPsi2ee, float);
DECLARE_SOA_COLUMN(PercentileFT0M, percentileFT0MJPsi2ee, float);
DECLARE_SOA_COLUMN(PercentileFT0C, percentileFT0CJPsi2ee, float);
DECLARE_SOA_COLUMN(MultiplicityNContrib, multiplicityNContribJPsi2ee, float);
DECLARE_SOA_COLUMN(AmbiguousInBunchPairs, AmbiguousJpsiPairsInBunch, bool);
DECLARE_SOA_COLUMN(AmbiguousOutOfBunchPairs, AmbiguousJpsiPairsOutOfBunch, bool);
DECLARE_SOA_COLUMN(Corrassoc, corrassoc, bool);
// Additional columns for prompt-non-prompt JPsi separation (BDT training), identical to tableReader_withAssoc
DECLARE_SOA_COLUMN(PairFilter, pairFilter, uint32_t); //! twoTrackFilter (cut bits + ambiguity bits 28-31)
DECLARE_SOA_COLUMN(McDecision, mcDecision, uint32_t); //! MC signal bits, 0 in data
DECLARE_SOA_COLUMN(TauxyeeErr, tauxyeeErr, float); //! kVertexingTauxyErr: in ns (not cm) and with the reconstructed mass
DECLARE_SOA_COLUMN(TauzeeErr, tauzeeErr, float); //! kVertexingTauzErr: in ns (not cm) and with the reconstructed mass
DECLARE_SOA_COLUMN(LxyeeProjected, lxyeeProjected, float); //! kVertexingLxyProjected
DECLARE_SOA_COLUMN(LxyeeOverErr, lxyeeOverErr, float); //! kVertexingLxyOverErr
DECLARE_SOA_COLUMN(Lxyzee, lxyzee, float); //! kVertexingLxyz
DECLARE_SOA_COLUMN(LxyzeeOverErr, lxyzeeOverErr, float); //! kVertexingLxyzOverErr
DECLARE_SOA_COLUMN(Chi2PCAee, chi2PCAee, float); //! kVertexingChi2PCA
DECLARE_SOA_COLUMN(CosPAee, cosPAee, float); //! kCosPointingAngle
DECLARE_SOA_COLUMN(DcaXYOverSig1, dcaXYOverSig1, float);
DECLARE_SOA_COLUMN(DcaZOverSig1, dcaZOverSig1, float);
DECLARE_SOA_COLUMN(DcaXYOverSig2, dcaXYOverSig2, float);
DECLARE_SOA_COLUMN(DcaZOverSig2, dcaZOverSig2, float);
DECLARE_SOA_COLUMN(DeltaEta, deltaEta, float);
DECLARE_SOA_COLUMN(DeltaPhi, deltaPhi, float);
// Candidate columns efficiency calculation for prompt-non-prompt JPsi separation
Expand Down Expand Up @@ -224,10 +240,19 @@ DECLARE_SOA_TABLE(JPsiMuonCandidates, "AOD", "DQJPSIMUONA",
dqanalysisflags::Ptleg1, dqanalysisflags::Etaleg1, dqanalysisflags::Phileg1, dqanalysisflags::Ptleg2, dqanalysisflags::Etaleg2, dqanalysisflags::Phileg2,
dqanalysisflags::McFlag);
DECLARE_SOA_TABLE(JPsieeCandidates, "AOD", "DQPSEUDOPROPER",
dqanalysisflags::PairFilter, dqanalysisflags::McDecision,
dqanalysisflags::Massee, dqanalysisflags::Ptee, dqanalysisflags::Etaee, dqanalysisflags::Rapee, dqanalysisflags::Phiee,
dqanalysisflags::Lxyee, dqanalysisflags::LxyeePoleMass, dqanalysisflags::Lzee, dqanalysisflags::LxyeePoleMassPVrecomputed,
dqanalysisflags::Vx, dqanalysisflags::Vy, dqanalysisflags::Vz, dqanalysisflags::DcaXY1, dqanalysisflags::DcaZ1, dqanalysisflags::ITSClusterMapleg1, dqanalysisflags::TPCnsigmaElleg1, dqanalysisflags::DcaXY2, dqanalysisflags::DcaZ2, dqanalysisflags::ITSClusterMapleg2, dqanalysisflags::TPCnsigmaElleg2,
dqanalysisflags::AmbiguousInBunchPairs, dqanalysisflags::AmbiguousOutOfBunchPairs, dqanalysisflags::Corrassoc, dqanalysisflags::MultiplicityFT0A, dqanalysisflags::MultiplicityFT0C, dqanalysisflags::PercentileFT0M, dqanalysisflags::MultiplicityNContrib);
dqanalysisflags::TauxyeeErr, dqanalysisflags::TauzeeErr,
dqanalysisflags::LxyeeProjected, dqanalysisflags::LxyeeOverErr, dqanalysisflags::Lxyzee, dqanalysisflags::LxyzeeOverErr,
dqanalysisflags::Chi2PCAee, dqanalysisflags::CosPAee,
dqanalysisflags::Vx, dqanalysisflags::Vy, dqanalysisflags::Vz,
dqanalysisflags::Ptleg1, dqanalysisflags::Etaleg1, dqanalysisflags::DcaXY1, dqanalysisflags::DcaZ1, dqanalysisflags::DcaXYOverSig1, dqanalysisflags::DcaZOverSig1,
dqanalysisflags::ITSClusterMapleg1, dqanalysisflags::ITSChi2leg1,
dqanalysisflags::Ptleg2, dqanalysisflags::Etaleg2, dqanalysisflags::DcaXY2, dqanalysisflags::DcaZ2, dqanalysisflags::DcaXYOverSig2, dqanalysisflags::DcaZOverSig2,
dqanalysisflags::ITSClusterMapleg2, dqanalysisflags::ITSChi2leg2,
dqanalysisflags::AmbiguousInBunchPairs, dqanalysisflags::AmbiguousOutOfBunchPairs, dqanalysisflags::Corrassoc,
dqanalysisflags::MultiplicityFT0C, dqanalysisflags::PercentileFT0C, dqanalysisflags::MultiplicityNContrib);
DECLARE_SOA_TABLE(OniaMCTruth, "AOD", "MCTRUTHONIA", dqanalysisflags::OniaPt, dqanalysisflags::OniaEta, dqanalysisflags::OniaY, dqanalysisflags::OniaPhi, dqanalysisflags::OniaVz, dqanalysisflags::OniaVtxZ, dqanalysisflags::MultiplicityFT0A, dqanalysisflags::MultiplicityFT0C, dqanalysisflags::PercentileFT0M, dqanalysisflags::MultiplicityNContrib);
} // namespace o2::aod

Expand Down Expand Up @@ -2371,6 +2396,28 @@ struct AnalysisSameEventPairing {
}
}
}
constexpr bool eventHasVtxCovForTable = ((TEventFillMap & VarManager::ObjTypes::ReducedEventVtxCov) > 0);
if constexpr ((TTrackFillMap & VarManager::ObjTypes::ReducedTrackBarrelPID) > 0 && trackHasCov && TTwoProngFitter && eventHasVtxCovForTable) {
// kVertexingProcCode == 0: the fit failed; FillPairVertexing then returns early without updating the
// projected / pseudo-proper / pointing-angle variables, so they would be stale -> skip the pair
if (t1.sign() * t2.sign() < 0 && mcDecision > 0) {
const bool ambiInBunch = (twoTrackFilter & (static_cast<uint32_t>(1) << 28)) || (twoTrackFilter & (static_cast<uint32_t>(1) << 29));
const bool ambiOutOfBunch = (twoTrackFilter & (static_cast<uint32_t>(1) << 30)) || (twoTrackFilter & (static_cast<uint32_t>(1) << 31));
PromptNonPromptSepTable(twoTrackFilter, mcDecision,
VarManager::fgValues[VarManager::kMass], VarManager::fgValues[VarManager::kPt], VarManager::fgValues[VarManager::kEta], VarManager::fgValues[VarManager::kRap], VarManager::fgValues[VarManager::kPhi],
VarManager::fgValues[VarManager::kVertexingTauxyProjected], VarManager::fgValues[VarManager::kVertexingTauxyProjectedPoleJPsiMass], VarManager::fgValues[VarManager::kVertexingTauzProjected], VarManager::fgValues[VarManager::kVertexingTauxyProjectedPoleJPsiMassRecalculatePV],
VarManager::fgValues[VarManager::kVertexingTauxyErr], VarManager::fgValues[VarManager::kVertexingTauzErr],
VarManager::fgValues[VarManager::kVertexingLxyProjected], VarManager::fgValues[VarManager::kVertexingLxyOverErr], VarManager::fgValues[VarManager::kVertexingLxyz], VarManager::fgValues[VarManager::kVertexingLxyzOverErr],
VarManager::fgValues[VarManager::kVertexingChi2PCA], VarManager::fgValues[VarManager::kCosPointingAngle],
VarManager::fgValues[VarManager::kVtxX], VarManager::fgValues[VarManager::kVtxY], VarManager::fgValues[VarManager::kVtxZ],
t1.pt(), t1.eta(), VarManager::fgValues[VarManager::kDCAxy1], VarManager::fgValues[VarManager::kDCAz1], VarManager::fgValues[VarManager::kDCAxyOverSig1], VarManager::fgValues[VarManager::kDCAzOverSig1],
VarManager::fgValues[VarManager::kITSclusterMap1], t1.itsChi2NCl(),
t2.pt(), t2.eta(), VarManager::fgValues[VarManager::kDCAxy2], VarManager::fgValues[VarManager::kDCAz2], VarManager::fgValues[VarManager::kDCAxyOverSig2], VarManager::fgValues[VarManager::kDCAzOverSig2],
VarManager::fgValues[VarManager::kITSclusterMap2], t2.itsChi2NCl(),
ambiInBunch, ambiOutOfBunch, isCorrectAssoc_leg1 && isCorrectAssoc_leg2,
VarManager::fgValues[VarManager::kMultFT0C], VarManager::fgValues[VarManager::kCentFT0C], VarManager::fgValues[VarManager::kVtxNcontribReal]);
}
}
}

if constexpr (TPairType == VarManager::kDecayToMuMu) {
Expand Down Expand Up @@ -2469,11 +2516,6 @@ struct AnalysisSameEventPairing {
// Fill histograms
bool isAmbiInBunch = false;
bool isAmbiOutOfBunch = false;
bool isCorrect_pair = false;
if (isCorrectAssoc_leg1 && isCorrectAssoc_leg2) {
isCorrect_pair = true;
}

for (int icut = 0; icut < ncuts; icut++) {
if (twoTrackFilter & (static_cast<uint32_t>(1) << icut)) {
isAmbiInBunch = (twoTrackFilter & (static_cast<uint32_t>(1) << 28)) || (twoTrackFilter & (static_cast<uint32_t>(1) << 29));
Expand All @@ -2482,10 +2524,6 @@ struct AnalysisSameEventPairing {
fHistMan->FillHistClass(histNames[icut][0].Data(), dqefficiency_helpers::varValues()); // reconstructed, unmatched
for (unsigned int isig = 0; isig < fRecMCSignals.size(); isig++) { // loop over MC signals
if (mcDecision & (static_cast<uint32_t>(1) << isig)) {
PromptNonPromptSepTable(VarManager::fgValues[VarManager::kMass], VarManager::fgValues[VarManager::kPt], VarManager::fgValues[VarManager::kEta], VarManager::fgValues[VarManager::kRap], VarManager::fgValues[VarManager::kPhi],
VarManager::fgValues[VarManager::kVertexingTauxyProjected], VarManager::fgValues[VarManager::kVertexingTauxyProjectedPoleJPsiMass], VarManager::fgValues[VarManager::kVertexingTauzProjected], VarManager::fgValues[VarManager::kVertexingTauxyProjectedPoleJPsiMassRecalculatePV],
VarManager::fgValues[VarManager::kVtxX], VarManager::fgValues[VarManager::kVtxY], VarManager::fgValues[VarManager::kVtxZ], VarManager::fgValues[VarManager::kDCAxy1], VarManager::fgValues[VarManager::kDCAz1], VarManager::fgValues[VarManager::kITSclusterMap1], VarManager::fgValues[VarManager::kTPCnSigmaEl1], VarManager::fgValues[VarManager::kDCAxy2], VarManager::fgValues[VarManager::kDCAz2], VarManager::fgValues[VarManager::kITSclusterMap2], VarManager::fgValues[VarManager::kTPCnSigmaEl2],
isAmbiInBunch, isAmbiOutOfBunch, isCorrect_pair, VarManager::fgValues[VarManager::kMultFT0A], VarManager::fgValues[VarManager::kMultFT0C], VarManager::fgValues[VarManager::kCentFT0M], VarManager::fgValues[VarManager::kVtxNcontribReal]);
fHistMan->FillHistClass(histNamesMC[icut * fRecMCSignals.size() + isig][0].Data(), dqefficiency_helpers::varValues()); // matched signal
if (useMiniTree.fConfigMiniTree) {
if constexpr (TPairType == VarManager::kDecayToMuMu) {
Expand Down Expand Up @@ -2638,6 +2676,11 @@ struct AnalysisSameEventPairing {
if (!event.has_reducedMCevent()) {
continue;
}
// Fill the event-wise variables (e.g. centrality) of this reconstructed event, otherwise the generated particles and pairs
// get the values left over from the last event processed in runSameEventPairing
VarManager::ResetValues(0, VarManager::kNVars);
VarManager::FillEvent<gkEventFillMap>(event, dqefficiency_helpers::varValues());
VarManager::FillEvent<VarManager::ObjTypes::ReducedEventMC>(event.reducedMCevent(), dqefficiency_helpers::varValues());

FinalStateMcParticleIndices.clear();

Expand Down
Loading
Loading