Skip to content

[PWGDQ] Generalize Jpis-D0 associated table maker to also include Dplus #17833

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

Open
lmattei01 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[PWGDQ] Generalize Jpis-D0 associated table maker to also include Dplus #17833

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
f4047c3
Generalize Jpis-D0 associated table maker to also include Dplus
lmattei01 Sep 8, 2026
0b248aa
Please consider the following formatting changes
alibuild Sep 8, 2026
c5d3bfa
Merge pull request #2 from alibuild/alibot-cleanup-17833
lmattei01 Sep 8, 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
10 changes: 9 additions & 1 deletion PWGDQ/Core/VarManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,7 +1214,8 @@
enum DileptonCharmHadronTypes {
kJPsi = 0,
kD0ToPiK,
kD0barToKPi
kD0barToKPi,
kDplusToPiKPi
};

enum EventFilters {
Expand Down Expand Up @@ -1592,7 +1593,7 @@
{
fgITSROFbias = bias;
fgITSROFlength = length;
fgITSROFBorderMarginLow = marginLow;

Check failure on line 1596 in PWGDQ/Core/VarManager.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
fgITSROFBorderMarginHigh = marginHigh;
}

Expand Down Expand Up @@ -1835,7 +1836,7 @@
}

template <typename T, typename C>
o2::track::TrackParCovFwd VarManager::PropagateFwd(const T& track, const C& cov, float z)

Check failure on line 1839 in PWGDQ/Core/VarManager.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
{
o2::track::TrackParCovFwd fwdtrack = FwdToTrackPar(track, cov);
fwdtrack.propagateToZhelix(z, fgMagField);
Expand All @@ -1860,7 +1861,7 @@
values[kMuonPDca] = muon.p() * dcaXY;
}
}

Check failure on line 1864 in PWGDQ/Core/VarManager.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
template <uint32_t fillMap, typename T, typename C>
void VarManager::FillPropagateMuon(const T& muon, const C& collision, float* values)
{
Expand Down Expand Up @@ -1922,7 +1923,7 @@
{
if (!values) {
values = fgValues;
}

Check failure on line 1926 in PWGDQ/Core/VarManager.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
if constexpr ((fillMap & MuonCov) > 0 || (fillMap & ReducedMuonCov) > 0) {
o2::dataformats::GlobalFwdTrack propmuon = PropagateMuon(muontrack, collision);
double px = propmuon.getP() * std::sin(o2::constants::math::PIHalf - std::atan(mfttrack.tgl())) * std::cos(mfttrack.phi());
Expand Down Expand Up @@ -2731,7 +2732,7 @@
values[kDCAzMeanBinnedTrimmed1] = meanBinTrimmed1;
values[kDCAzRMSBinnedTrimmed1] = stddevBinTrimmed1;
} else {
values[kDCAzBimodalityCoefficientBinnedTrimmed1] = -9999.0;

Check failure on line 2735 in PWGDQ/Core/VarManager.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
values[kDCAzMeanBinnedTrimmed1] = -9999.0;
values[kDCAzRMSBinnedTrimmed1] = -9999.0;
}
Expand Down Expand Up @@ -2819,15 +2820,15 @@
int idx_ep = hs_ep->FindBin(values[kCentFT0C]);

values[kR2SP] = hs_sp->GetBinContent(idx_sp);
values[kR2EP] = hs_ep->GetBinContent(idx_ep);

Check failure on line 2823 in PWGDQ/Core/VarManager.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
}
}

Check failure on line 2825 in PWGDQ/Core/VarManager.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.

template <typename T>

Check failure on line 2827 in PWGDQ/Core/VarManager.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
void VarManager::FillTwoMixEventsFlowResoFactor(T const& hs_sp, T const& hs_ep, float* values)
{

Check failure on line 2829 in PWGDQ/Core/VarManager.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
if (!values) {
values = fgValues;

Check failure on line 2831 in PWGDQ/Core/VarManager.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
}

if (values[kTwoEvCentFT0C1] >= 0.) {
Expand Down Expand Up @@ -6608,6 +6609,13 @@
values[kRapCharmHadron] = hfHelper.yD0(candidate);
values[kBdtCharmHadron] = static_cast<float>(bdtScoreCharmHad);
}
if constexpr (partType == kDplusToPiKPi) {
values[kMassCharmHadron] = hfHelper.invMassDplusToPiKPi(candidate);
values[kPtCharmHadron] = candidate.pt();
values[kPhiCharmHadron] = candidate.phi();
values[kRapCharmHadron] = hfHelper.yDplus(candidate);
values[kBdtCharmHadron] = static_cast<float>(bdtScoreCharmHad);
}
}

template <int partTypeCharmHad, typename DQ, typename HF, typename H, typename T>
Expand Down
34 changes: 34 additions & 0 deletions PWGDQ/DataModel/ReducedInfoTables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1338,32 +1338,44 @@ DECLARE_SOA_COLUMN(DeltaY, deltaY, float);
DECLARE_SOA_COLUMN(DeltaPhi, deltaPhi, float); //!
DECLARE_SOA_COLUMN(NumItsClsDmesProng0, numItsClsDmesProng0, int); //!
DECLARE_SOA_COLUMN(NumItsClsDmesProng1, numItsClsDmesProng1, int); //!
DECLARE_SOA_COLUMN(NumItsClsDmesProng2, numItsClsDmesProng2, int); //!
DECLARE_SOA_COLUMN(NumTpcCrossedRowsDmesProng0, numTpcCrossedRowsDmesProng0, int); //!
DECLARE_SOA_COLUMN(NumTpcCrossedRowsDmesProng1, numTpcCrossedRowsDmesProng1, int); //!
DECLARE_SOA_COLUMN(NumTpcCrossedRowsDmesProng2, numTpcCrossedRowsDmesProng2, int); //!
DECLARE_SOA_COLUMN(EtaDmesProng0, etaDmesProng0, float); //!
DECLARE_SOA_COLUMN(EtaDmesProng1, etaDmesProng1, float); //!
DECLARE_SOA_COLUMN(EtaDmesProng2, etaDmesProng2, float); //!
DECLARE_SOA_COLUMN(PtDmesProng0, ptDmesProng0, float); //!
DECLARE_SOA_COLUMN(PtDmesProng1, ptDmesProng1, float); //!
DECLARE_SOA_COLUMN(PtDmesProng2, ptDmesProng2, float); //!
DECLARE_SOA_COLUMN(MinNumItsClsDmesProng, minNumItsClsDmesProng, int); //!
DECLARE_SOA_COLUMN(MinNumTpcCrossedRowsDmesProng, minNumTpcCrossedRowsDmesProng, int); //!
DECLARE_SOA_COLUMN(MinAbsEtaDmesProng, minAbsEtaDmesProng, float); //!
DECLARE_SOA_COLUMN(MinPtDmesProng, minPtDmesProng, float); //!
DECLARE_SOA_COLUMN(NumSigmaTpcPiProng0, numSigmaTpcPiProng0, float); //!
DECLARE_SOA_COLUMN(NumSigmaTpcPiProng1, numSigmaTpcPiProng1, float); //!
DECLARE_SOA_COLUMN(NumSigmaTpcPiProng2, numSigmaTpcPiProng2, float); //!
DECLARE_SOA_COLUMN(NumSigmaTofPiProng0, numSigmaTofPiProng0, float); //!
DECLARE_SOA_COLUMN(NumSigmaTofPiProng1, numSigmaTofPiProng1, float); //!
DECLARE_SOA_COLUMN(NumSigmaTofPiProng2, numSigmaTofPiProng2, float); //!
DECLARE_SOA_COLUMN(NumSigmaTpcKaProng0, numSigmaTpcKaProng0, float); //!
DECLARE_SOA_COLUMN(NumSigmaTpcKaProng1, numSigmaTpcKaProng1, float); //!
DECLARE_SOA_COLUMN(NumSigmaTpcKaProng2, numSigmaTpcKaProng2, float); //!
DECLARE_SOA_COLUMN(NumSigmaTofKaProng0, numSigmaTofKaProng0, float); //!
DECLARE_SOA_COLUMN(NumSigmaTofKaProng1, numSigmaTofKaProng1, float); //!
DECLARE_SOA_COLUMN(NumSigmaTofKaProng2, numSigmaTofKaProng2, float); //!
DECLARE_SOA_DYNAMIC_COLUMN(NumSigmaTpcTofPiProng0, numSigmaTpcTofPiProng0, //!
[](float tpcNSigmaPi0, float tofNSigmaPi0) -> float { return pid_tpc_tof_utils::combineNSigma<false /*tiny*/>(tpcNSigmaPi0, tofNSigmaPi0); });
DECLARE_SOA_DYNAMIC_COLUMN(NumSigmaTpcTofPiProng1, numSigmaTpcTofPiProng1, //!
[](float tpcNSigmaPi1, float tofNSigmaPi1) -> float { return pid_tpc_tof_utils::combineNSigma<false /*tiny*/>(tpcNSigmaPi1, tofNSigmaPi1); });
DECLARE_SOA_DYNAMIC_COLUMN(NumSigmaTpcTofPiProng2, numSigmaTpcTofPiProng2, //!
[](float tpcNSigmaPi2, float tofNSigmaPi2) -> float { return pid_tpc_tof_utils::combineNSigma<false /*tiny*/>(tpcNSigmaPi2, tofNSigmaPi2); });
DECLARE_SOA_DYNAMIC_COLUMN(NumSigmaTpcTofKaProng0, numSigmaTpcTofKaProng0, //!
[](float tpcNSigmaKa0, float tofNSigmaKa0) -> float { return pid_tpc_tof_utils::combineNSigma<false /*tiny*/>(tpcNSigmaKa0, tofNSigmaKa0); });
DECLARE_SOA_DYNAMIC_COLUMN(NumSigmaTpcTofKaProng1, numSigmaTpcTofKaProng1, //!
[](float tpcNSigmaKa1, float tofNSigmaKa1) -> float { return pid_tpc_tof_utils::combineNSigma<false /*tiny*/>(tpcNSigmaKa1, tofNSigmaKa1); });
DECLARE_SOA_DYNAMIC_COLUMN(NumSigmaTpcTofKaProng2, numSigmaTpcTofKaProng2, //!
[](float tpcNSigmaKa2, float tofNSigmaKa2) -> float { return pid_tpc_tof_utils::combineNSigma<false /*tiny*/>(tpcNSigmaKa2, tofNSigmaKa2); });
} // namespace jpsidmescorr

DECLARE_SOA_TABLE(RedJpDmDileptons, "AOD", "REDJPDMDILEPTON", //!
Expand Down Expand Up @@ -1418,6 +1430,23 @@ DECLARE_SOA_TABLE(RedJpDmDmDau1s, "AOD", "REDJPDMDMDAU1", //!
jpsidmescorr::NumSigmaTpcTofPiProng1<jpsidmescorr::NumSigmaTpcPiProng1, jpsidmescorr::NumSigmaTofPiProng1>,
jpsidmescorr::NumSigmaTpcTofKaProng1<jpsidmescorr::NumSigmaTpcKaProng1, jpsidmescorr::NumSigmaTofKaProng1>);

DECLARE_SOA_TABLE(RedJpDmDmDau2s, "AOD", "REDJPDMDMDAU2", //!
jpsidmescorr::PtDmesProng2,
jpsidmescorr::EtaDmesProng2,
jpsidmescorr::NumItsClsDmesProng2,
jpsidmescorr::NumTpcCrossedRowsDmesProng2,
jpsidmescorr::NumSigmaTpcPiProng2,
jpsidmescorr::NumSigmaTofPiProng2,
jpsidmescorr::NumSigmaTpcKaProng2,
jpsidmescorr::NumSigmaTofKaProng2,
jpsidmescorr::NumSigmaTpcTofPiProng2<jpsidmescorr::NumSigmaTpcPiProng2, jpsidmescorr::NumSigmaTofPiProng2>,
jpsidmescorr::NumSigmaTpcTofKaProng2<jpsidmescorr::NumSigmaTpcKaProng2, jpsidmescorr::NumSigmaTofKaProng2>);

// General table for Dmeson mass
DECLARE_SOA_TABLE(RedJpDmDmesMasss, "AOD", "REDJPDMDMESMASS", //???
jpsidmescorr::MassDmes);

// Special table for D0 mass: particle and antiparticle separated
DECLARE_SOA_TABLE(RedJpDmD0Masss, "AOD", "REDJPDMD0MASS", //!
jpsidmescorr::MassD0,
jpsidmescorr::MassD0bar);
Expand All @@ -1430,6 +1459,11 @@ DECLARE_SOA_TABLE(RedJpDmDmesBdts, "AOD", "REDJPDMDMESBDT", //!
jpsidmescorr::BdtPromptMassHypo1,
jpsidmescorr::BdtNonpromptMassHypo1);

DECLARE_SOA_TABLE(RedJpDmDplusBdts, "AOD", "REDJPDMDPLUSBDT",
jpsidmescorr::BdtBkgMassHypo0,
jpsidmescorr::BdtPromptMassHypo0,
jpsidmescorr::BdtNonpromptMassHypo0);

DECLARE_SOA_TABLE(RedDleptDmesAll, "AOD", "RTDILPTDMESALL", //!
reducedpair::Mass,
jpsidmescorr::MassDmes,
Expand Down
Loading
Loading