Skip to content

PWGDQ: Adapt D0 BDT columns to new development in HF #3854

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
lucamicheletti93 merged 3 commits into from
Nov 15, 2023
Merged

PWGDQ: Adapt D0 BDT columns to new development in HF #3854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eab2c6c
PWGDQ: Adapt D0 BDT columns to new development in HF
fgrosa Nov 14, 2023
2cff8d5
Fix format and add protection in case of no BDT selection
fgrosa Nov 14, 2023
eb6a815
Fix format
fgrosa Nov 14, 2023
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
57 changes: 33 additions & 24 deletions PWGDQ/DataModel/ReducedInfoTables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,27 +577,33 @@ DECLARE_SOA_TABLE(RedJpDmColls, "AOD", "REDJPDMCOLL", //!

namespace jpsidmescorr
{
DECLARE_SOA_INDEX_COLUMN(RedJpDmColl, redJpDmColl); //!
DECLARE_SOA_COLUMN(MassD0, massD0, float); //!
DECLARE_SOA_COLUMN(MassD0bar, massD0bar, float); //!
DECLARE_SOA_COLUMN(Px, px, float); //!
DECLARE_SOA_COLUMN(Py, py, float); //!
DECLARE_SOA_COLUMN(Pz, pz, float); //!
DECLARE_SOA_COLUMN(DecVtxX, decVtxX, float); //!
DECLARE_SOA_COLUMN(DecVtxY, decVtxY, float); //!
DECLARE_SOA_COLUMN(DecVtxZ, decVtxZ, float); //!
DECLARE_SOA_COLUMN(BdtBkg, bdtBkg, float); //!
DECLARE_SOA_COLUMN(BdtPrompt, bdtPrompt, float); //!
DECLARE_SOA_COLUMN(BdtNonprompt, bdtNonprompt, float); //!
DECLARE_SOA_COLUMN(NumColls, numColls, uint64_t); //!
DECLARE_SOA_COLUMN(PtD0, ptD0, float); //!
DECLARE_SOA_COLUMN(PtJpsi, ptJpsi, float); //!
DECLARE_SOA_COLUMN(RapD0, rapD0, float); //!
DECLARE_SOA_COLUMN(RapJpsi, rapJpsi, float); //!
DECLARE_SOA_COLUMN(PhiD0, phiD0, float); //!
DECLARE_SOA_COLUMN(PhiJpsi, phiJpsi, float); //!
DECLARE_SOA_COLUMN(DeltaY, deltaY, float); //!
DECLARE_SOA_COLUMN(DeltaPhi, deltaPhi, float); //!
DECLARE_SOA_INDEX_COLUMN(RedJpDmColl, redJpDmColl); //!
DECLARE_SOA_COLUMN(MassD0, massD0, float); //!
DECLARE_SOA_COLUMN(MassD0bar, massD0bar, float); //!
DECLARE_SOA_COLUMN(Px, px, float); //!
DECLARE_SOA_COLUMN(Py, py, float); //!
DECLARE_SOA_COLUMN(Pz, pz, float); //!
DECLARE_SOA_COLUMN(DecVtxX, decVtxX, float); //!
DECLARE_SOA_COLUMN(DecVtxY, decVtxY, float); //!
DECLARE_SOA_COLUMN(DecVtxZ, decVtxZ, float); //!
DECLARE_SOA_COLUMN(BdtBkgMassHypo0, bdtBkgMassHypo0, float); //!
DECLARE_SOA_COLUMN(BdtPromptMassHypo0, bdtPromptMassHypo0, float); //!
DECLARE_SOA_COLUMN(BdtNonpromptMassHypo0, bdtNonpromptMassHypo0, float); //!
DECLARE_SOA_COLUMN(BdtBkg, bdtBkg, float); //!
DECLARE_SOA_COLUMN(BdtPrompt, bdtPrompt, float); //!
DECLARE_SOA_COLUMN(BdtNonprompt, bdtNonprompt, float); //!
DECLARE_SOA_COLUMN(BdtBkgMassHypo1, bdtBkgMassHypo1, float); //!
DECLARE_SOA_COLUMN(BdtPromptMassHypo1, bdtPromptMassHypo1, float); //!
DECLARE_SOA_COLUMN(BdtNonpromptMassHypo1, bdtNonpromptMassHypo1, float); //!
DECLARE_SOA_COLUMN(NumColls, numColls, uint64_t); //!
DECLARE_SOA_COLUMN(PtD0, ptD0, float); //!
DECLARE_SOA_COLUMN(PtJpsi, ptJpsi, float); //!
DECLARE_SOA_COLUMN(RapD0, rapD0, float); //!
DECLARE_SOA_COLUMN(RapJpsi, rapJpsi, float); //!
DECLARE_SOA_COLUMN(PhiD0, phiD0, float); //!
DECLARE_SOA_COLUMN(PhiJpsi, phiJpsi, float); //!
DECLARE_SOA_COLUMN(DeltaY, deltaY, float); //!
DECLARE_SOA_COLUMN(DeltaPhi, deltaPhi, float); //!
} // namespace jpsidmescorr

DECLARE_SOA_TABLE(RedJpDmDileptons, "AOD", "REDJPDMDILEPTON", //!
Expand Down Expand Up @@ -633,9 +639,12 @@ DECLARE_SOA_TABLE(RedJpDmD0Masss, "AOD", "REDJPDMD0MASS", //!
jpsidmescorr::MassD0bar);

DECLARE_SOA_TABLE(RedJpDmDmesBdts, "AOD", "REDJPDMDMESBDT", //!
jpsidmescorr::BdtBkg,
jpsidmescorr::BdtPrompt,
jpsidmescorr::BdtNonprompt);
jpsidmescorr::BdtBkgMassHypo0,
jpsidmescorr::BdtPromptMassHypo0,
jpsidmescorr::BdtNonpromptMassHypo0,
jpsidmescorr::BdtBkgMassHypo1,
jpsidmescorr::BdtPromptMassHypo1,
jpsidmescorr::BdtNonpromptMassHypo1);

DECLARE_SOA_TABLE(RedDleptDmesAll, "AOD", "RTDILPTDMESALL", //!
reducedpair::Mass,
Expand Down
18 changes: 14 additions & 4 deletions PWGDQ/TableProducer/tableMakerJpsiHf.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,23 +208,33 @@ struct tableMakerJpsiHf {
isJPsiFilled = true;
}
redDmesons(indexRed, dmeson.px(), dmeson.py(), dmeson.pz(), dmeson.xSecondaryVertex(), dmeson.ySecondaryVertex(), dmeson.zSecondaryVertex(), 0, 0);
std::array<float, 6> scores = {999., -999., -999., 999., -999., -999.}; // D0 + D0bar
if constexpr (withBdt) {
auto scores = dmeson.mlProbD0();
redDmesBdts(scores[0], scores[1], scores[2]);
if (dmeson.mlProbD0().size() == 3) {
for (auto iScore{0u}; iScore < dmeson.mlProbD0().size(); ++iScore) {
scores[iScore] = dmeson.mlProbD0()[iScore];
}
}
if (dmeson.mlProbD0bar().size() == 3) {
for (auto iScore{0u}; iScore < dmeson.mlProbD0().size(); ++iScore) {
scores[iScore + 3] = dmeson.mlProbD0bar()[iScore];
}
}
redDmesBdts(scores[0], scores[1], scores[2], scores[3], scores[4], scores[5]);
}

auto ptBinForBdt = findBin(pTBinsBDT, dmeson.pt());
if (dmeson.isSelD0() >= 1) {
massD0 = hfHelper.invMassD0ToPiK(dmeson);
if (ptBinForBdt >= 0 && (scores[0] < bdtCutsForHistos->get(ptBinForBdt, 0u) && scores[1] > bdtCutsForHistos->get(ptBinForBdt, 1u) && scores[2] > bdtCutsForHistos->get(ptBinForBdt, 2u))) {
if (ptBinForBdt >= 0 && ((scores[0] < bdtCutsForHistos->get(ptBinForBdt, 0u) && scores[1] > bdtCutsForHistos->get(ptBinForBdt, 1u) && scores[2] > bdtCutsForHistos->get(ptBinForBdt, 2u)) || !withBdt)) {
VarManager::FillDileptonCharmHadron<VarManager::kD0ToPiK>(dilepton, dmeson, hfHelper, fValuesDileptonCharmHadron);
fHistMan->FillHistClass("JPsiDmeson", fValuesDileptonCharmHadron);
VarManager::ResetValues(0, VarManager::kNVars, fValuesDileptonCharmHadron);
}
}
if (dmeson.isSelD0bar() >= 1) {
massD0bar = hfHelper.invMassD0barToKPi(dmeson);
if (ptBinForBdt >= 0 && (scores[0] < bdtCutsForHistos->get(ptBinForBdt, 0u) && scores[1] > bdtCutsForHistos->get(ptBinForBdt, 1u) && scores[2] > bdtCutsForHistos->get(ptBinForBdt, 2u))) {
if (ptBinForBdt >= 0 && ((scores[3] < bdtCutsForHistos->get(ptBinForBdt, 0u) && scores[4] > bdtCutsForHistos->get(ptBinForBdt, 1u) && scores[5] > bdtCutsForHistos->get(ptBinForBdt, 2u)) || withBdt)) {
VarManager::FillDileptonCharmHadron<VarManager::kD0barToKPi>(dilepton, dmeson, hfHelper, fValuesDileptonCharmHadron);
fHistMan->FillHistClass("JPsiDmeson", fValuesDileptonCharmHadron);
VarManager::ResetValues(0, VarManager::kNVars, fValuesDileptonCharmHadron);
Expand Down
4 changes: 2 additions & 2 deletions PWGDQ/Tasks/taskJpsiHf.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,14 @@ struct taskJPsiHf {
rapDmeson = RecoDecay::y(std::array{dmeson.px(), dmeson.py(), dmeson.pz()}, dmeson.massD0());
deltaRap = rapDilepton - rapDmeson;
if ((dilepton.mass() > massDileptonCandMin && dilepton.mass() < massDileptonCandMax) && (dmeson.massD0() > massHfCandMin && dmeson.massD0() < massHfCandMax)) {
redDileptDimesAll(dilepton.mass(), dmeson.massD0(), ptDilepton, ptDmeson, rapDilepton, rapDmeson, phiDilepton, phiDmeson, deltaRap, deltaPhi, dmeson.bdtBkg(), dmeson.bdtPrompt(), dmeson.bdtNonprompt());
redDileptDimesAll(dilepton.mass(), dmeson.massD0(), ptDilepton, ptDmeson, rapDilepton, rapDmeson, phiDilepton, phiDmeson, deltaRap, deltaPhi, dmeson.bdtBkgMassHypo0(), dmeson.bdtPromptMassHypo0(), dmeson.bdtNonpromptMassHypo0());
}
}
if (dmeson.massD0bar() > 0) {
rapDmeson = RecoDecay::y(std::array{dmeson.px(), dmeson.py(), dmeson.pz()}, dmeson.massD0bar());
deltaRap = rapDilepton - rapDmeson;
if ((dilepton.mass() > massDileptonCandMin && dilepton.mass() < massDileptonCandMax) && (dmeson.massD0() > massHfCandMin && dmeson.massD0() < massHfCandMax)) {
redDileptDimesAll(dilepton.mass(), dmeson.massD0bar(), ptDilepton, ptDmeson, rapDilepton, rapDmeson, phiDilepton, phiDmeson, deltaRap, deltaPhi, dmeson.bdtBkg(), dmeson.bdtPrompt(), dmeson.bdtNonprompt());
redDileptDimesAll(dilepton.mass(), dmeson.massD0bar(), ptDilepton, ptDmeson, rapDilepton, rapDmeson, phiDilepton, phiDmeson, deltaRap, deltaPhi, dmeson.bdtBkgMassHypo1(), dmeson.bdtPromptMassHypo1(), dmeson.bdtNonpromptMassHypo1());
}
}
}
Expand Down