Skip to content

[PWGHF] Add D*pi channel in B0 reduced workflow #12451

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
fgrosa merged 12 commits into from
Aug 14, 2025
Merged

[PWGHF] Add D*pi channel in B0 reduced workflow #12451

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3ab9242
Add D*pi channel in B0 reduced workflow
Marcellocosti Jul 15, 2025
6311959
Please consider the following formatting changes
alibuild Aug 5, 2025
5911f24
Fix megalinter
Marcellocosti Aug 5, 2025
21835ac
Add include string
Marcellocosti Aug 5, 2025
99ee022
Implement Vit comments
Marcellocosti Aug 7, 2025
c370d11
Remove massB0
Marcellocosti Aug 7, 2025
3e77f58
Implement Fabrizio comments
Marcellocosti Aug 13, 2025
2446055
Please consider the following formatting changes
alibuild Aug 13, 2025
8a6b04e
Merge pull request #31 from alibuild/alibot-cleanup-12451
Marcellocosti Aug 13, 2025
e529118
Implement Fabrizio and Vit comments
Marcellocosti Aug 14, 2025
953bb91
Please consider the following formatting changes
alibuild Aug 14, 2025
6b3be6e
Merge pull request #32 from alibuild/alibot-cleanup-12451
Marcellocosti Aug 14, 2025
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
11 changes: 11 additions & 0 deletions PWGHF/Core/HfHelper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@
#include <cmath>
#include <vector>

template <typename T>
concept IsB0ToDstarPiChannel = requires(T candidate) {
candidate.prongD0Id();
};

class HfHelper
{
public:
Expand Down Expand Up @@ -634,6 +639,12 @@ class HfHelper
return candidate.m(std::array{o2::constants::physics::MassDMinus, o2::constants::physics::MassPiPlus});
}

template <IsB0ToDstarPiChannel T>
auto invMassB0ToDPi(const T& candidate)
{
return candidate.m(std::array{o2::constants::physics::MassD0, o2::constants::physics::MassPiPlus, o2::constants::physics::MassPiPlus});
}

template <typename T>
auto cosThetaStarB0(const T& candidate)
{
Expand Down
96 changes: 90 additions & 6 deletions PWGHF/Core/HfMlResponseB0ToDPi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#define PWGHF_CORE_HFMLRESPONSEB0TODPI_H_

#include "PWGHF/Core/HfMlResponse.h"
#include "PWGHF/D2H/DataModel/ReducedDataModel.h"
Copy link
Copy Markdown
Collaborator

@vkucera vkucera Aug 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this needed?

Copy link
Copy Markdown
Contributor Author

@Marcellocosti Marcellocosti Aug 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added this header as later in the same file I retrieve the soft pion of the D*, using the tables declared in ReducedDataModel.h with the line
auto prongSoftPi = candidate.template prongSoftPi_as<o2::soa::Join<o2::aod::HfRedSoftPiBases, o2::aod::HfRedSoftPiCov, o2::aod::HfRedSoftPiPid>>();

#include "PWGHF/D2H/Utils/utilsRedDataFormat.h"

#include "Tools/ML/MlResponse.h"
Expand Down Expand Up @@ -75,9 +76,12 @@ namespace o2::analysis
enum class InputFeaturesB0ToDPi : uint8_t {
ptProng0 = 0,
ptProng1,
ptProng2,
impactParameter0,
impactParameter1,
impactParameter2,
impactParameterProduct,
impactParameterProngSqSum,
chi2PCA,
decayLength,
decayLengthXY,
Expand All @@ -91,7 +95,13 @@ enum class InputFeaturesB0ToDPi : uint8_t {
prong0MlScoreNonprompt,
tpcNSigmaPi1,
tofNSigmaPi1,
tpcTofNSigmaPi1
tpcTofNSigmaPi1,
tpcNSigmaPiBachPi,
tofNSigmaPiBachPi,
tpcTofNSigmaPiBachPi,
tpcNSigmaPiSoftPi,
tofNSigmaPiSoftPi,
tpcTofNSigmaPiSoftPi
};

template <typename TypeOutputScore, bool reduced>
Expand All @@ -109,7 +119,7 @@ class HfMlResponseB0ToDPi : public HfMlResponse<TypeOutputScore>
/// \return inputFeatures vector
template <bool withDmesMl, typename T1, typename T2>
std::vector<float> getInputFeatures(T1 const& candidate,
T2 const& prong1,
T2 const& prongBachPi,
const std::vector<float>* mlScoresD = nullptr)
{
std::vector<float> inputFeatures;
Expand All @@ -130,11 +140,76 @@ class HfMlResponseB0ToDPi : public HfMlResponse<TypeOutputScore>
CHECK_AND_FILL_VEC_B0(cpaXY);
CHECK_AND_FILL_VEC_B0(maxNormalisedDeltaIP);
// TPC PID variable
CHECK_AND_FILL_VEC_B0_FULL(prong1, tpcNSigmaPi1, tpcNSigmaPi);
CHECK_AND_FILL_VEC_B0_FULL(prongBachPi, tpcNSigmaPi1, tpcNSigmaPi);
// TOF PID variable
CHECK_AND_FILL_VEC_B0_FULL(prong1, tofNSigmaPi1, tofNSigmaPi);
CHECK_AND_FILL_VEC_B0_FULL(prongBachPi, tofNSigmaPi1, tofNSigmaPi);
// Combined PID variables
CHECK_AND_FILL_VEC_B0_FUNC(prong1, tpcTofNSigmaPi1, o2::pid_tpc_tof_utils::getTpcTofNSigmaPi1);
CHECK_AND_FILL_VEC_B0_FUNC(prongBachPi, tpcTofNSigmaPi1, o2::pid_tpc_tof_utils::getTpcTofNSigmaPi1);
}
if constexpr (withDmesMl) {
if constexpr (reduced) {
switch (idx) {
CHECK_AND_FILL_VEC_B0(prong0MlScoreBkg);
CHECK_AND_FILL_VEC_B0(prong0MlScorePrompt);
CHECK_AND_FILL_VEC_B0(prong0MlScoreNonprompt);
}
} else {
if (mlScoresD) {
switch (idx) {
CHECK_AND_FILL_VEC_B0_INDEX(prong0MlScoreBkg, *mlScoresD, 0);
CHECK_AND_FILL_VEC_B0_INDEX(prong0MlScorePrompt, *mlScoresD, 1);
CHECK_AND_FILL_VEC_B0_INDEX(prong0MlScoreNonprompt, *mlScoresD, 2);
}
} else {
LOG(fatal) << "ML scores of D not provided";
}
}
}
}

return inputFeatures;
}

/// Method to get the input features vector needed for ML inference
/// \param candidate is the B0 candidate
/// \param prongBachPi is the candidate's bachelor pion prong
/// \param mlScoresD is the vector of ML scores for the D meson (if available)
/// \note this method is used for B0 → D*∓ π± candidates with D meson ML scores
/// \return inputFeatures vector
template <bool withDmesMl, IsB0ToDstarPiChannel T1, typename T2>
std::vector<float> getInputFeatures(T1 const& candidate,
T2 const& prongBachPi,
const std::vector<float>* mlScoresD = nullptr)
{
std::vector<float> inputFeatures;
auto prongSoftPi = candidate.template prongSoftPi_as<o2::soa::Join<o2::aod::HfRedSoftPiBases, o2::aod::HfRedSoftPiCov, o2::aod::HfRedSoftPiPid>>();
Comment thread
vkucera marked this conversation as resolved.
Outdated

for (const auto& idx : MlResponse<TypeOutputScore>::mCachedIndices) {
switch (idx) {
CHECK_AND_FILL_VEC_B0(ptProng0);
CHECK_AND_FILL_VEC_B0(ptProng1);
CHECK_AND_FILL_VEC_B0(ptProng2);
CHECK_AND_FILL_VEC_B0(impactParameter0);
CHECK_AND_FILL_VEC_B0(impactParameter1);
CHECK_AND_FILL_VEC_B0(impactParameter2);
CHECK_AND_FILL_VEC_B0(impactParameterProngSqSum);
CHECK_AND_FILL_VEC_B0(chi2PCA);
CHECK_AND_FILL_VEC_B0(decayLength);
CHECK_AND_FILL_VEC_B0(decayLengthXY);
CHECK_AND_FILL_VEC_B0(decayLengthNormalised);
CHECK_AND_FILL_VEC_B0(decayLengthXYNormalised);
CHECK_AND_FILL_VEC_B0(cpa);
CHECK_AND_FILL_VEC_B0(cpaXY);
CHECK_AND_FILL_VEC_B0(maxNormalisedDeltaIP);
// TPC PID variable
CHECK_AND_FILL_VEC_B0_FULL(prongBachPi, tpcNSigmaPiBachPi, tpcNSigmaPi);
CHECK_AND_FILL_VEC_B0_FULL(prongSoftPi, tpcNSigmaPiSoftPi, tpcNSigmaPiSoftPi);
// TOF PID variable
CHECK_AND_FILL_VEC_B0_FULL(prongBachPi, tofNSigmaPiBachPi, tofNSigmaPi);
CHECK_AND_FILL_VEC_B0_FULL(prongSoftPi, tofNSigmaPiSoftPi, tofNSigmaPiSoftPi);
// Combined PID variables
CHECK_AND_FILL_VEC_B0_FUNC(prongBachPi, tpcTofNSigmaPiBachPi, o2::pid_tpc_tof_utils::getTpcTofNSigmaPi1);
CHECK_AND_FILL_VEC_B0_FUNC(prongSoftPi, tpcTofNSigmaPiSoftPi, o2::pid_tpc_tof_utils::getTpcTofNSigmaSoftPi);
}
if constexpr (withDmesMl) {
if constexpr (reduced) {
Expand Down Expand Up @@ -167,9 +242,12 @@ class HfMlResponseB0ToDPi : public HfMlResponse<TypeOutputScore>
MlResponse<TypeOutputScore>::mAvailableInputFeatures = {
FILL_MAP_B0(ptProng0),
FILL_MAP_B0(ptProng1),
FILL_MAP_B0(ptProng2),
FILL_MAP_B0(impactParameter0),
FILL_MAP_B0(impactParameter1),
FILL_MAP_B0(impactParameter2),
FILL_MAP_B0(impactParameterProduct),
FILL_MAP_B0(impactParameterProngSqSum),
FILL_MAP_B0(chi2PCA),
FILL_MAP_B0(decayLength),
FILL_MAP_B0(decayLengthXY),
Expand All @@ -183,10 +261,16 @@ class HfMlResponseB0ToDPi : public HfMlResponse<TypeOutputScore>
FILL_MAP_B0(prong0MlScoreNonprompt),
// TPC PID variable
FILL_MAP_B0(tpcNSigmaPi1),
FILL_MAP_B0(tpcNSigmaPiSoftPi),
FILL_MAP_B0(tpcNSigmaPiBachPi),
// TOF PID variable
FILL_MAP_B0(tofNSigmaPi1),
FILL_MAP_B0(tofNSigmaPiSoftPi),
FILL_MAP_B0(tofNSigmaPiBachPi),
// Combined PID variable
FILL_MAP_B0(tpcTofNSigmaPi1)};
FILL_MAP_B0(tpcTofNSigmaPi1),
FILL_MAP_B0(tpcTofNSigmaPiSoftPi),
FILL_MAP_B0(tpcTofNSigmaPiBachPi)};
}
};

Expand Down
83 changes: 66 additions & 17 deletions PWGHF/D2H/DataModel/ReducedDataModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,24 +293,12 @@ DECLARE_SOA_TABLE(HfRedTracksCov, "AOD", "HFREDTRACKCOV", //! Table with track c
HFTRACKPARCOV_COLUMNS,
o2::soa::Marker<1>);

DECLARE_SOA_TABLE(HfRedSoftPiBases, "AOD", "HFREDSOFTPIBASE", //! Table with track information for reduced workflow
soa::Index<>,
hf_track_index_reduced::TrackId,
hf_track_index_reduced::HfRedCollisionId,
HFTRACKPAR_COLUMNS,
hf_track_vars_reduced::ItsNCls,
hf_track_vars_reduced::TpcNClsCrossedRows,
hf_track_vars_reduced::TpcChi2NCl,
aod::track::Px<aod::track::Signed1Pt, aod::track::Snp, aod::track::Alpha>,
aod::track::Py<aod::track::Signed1Pt, aod::track::Snp, aod::track::Alpha>,
aod::track::Pz<aod::track::Signed1Pt, track::Tgl>,
aod::track::PVector<aod::track::Signed1Pt, aod::track::Snp, aod::track::Alpha, aod::track::Tgl>,
o2::soa::Marker<2>);

DECLARE_SOA_TABLE(HfRedSoftPiCov, "AOD", "HFREDSOFTPICOV", //! Table with track covariance information for reduced workflow
DECLARE_SOA_TABLE(HfRedTracksMom, "AOD", "HFREDTRACKMOM", //! Table with track momentum information for reduced workflow
soa::Index<>,
HFTRACKPARCOV_COLUMNS,
o2::soa::Marker<2>);
hf_track_vars_reduced::Px,
hf_track_vars_reduced::Py,
hf_track_vars_reduced::Pz,
hf_track_vars_reduced::Sign);

// CAREFUL: need to follow convention [Name = Description + 's'] in DECLARE_SOA_TABLE(Name, "AOD", Description)
// to call DECLARE_SOA_INDEX_COLUMN_FULL later on
Expand Down Expand Up @@ -546,6 +534,39 @@ DECLARE_SOA_TABLE(HfRed2ProngsMl, "AOD", "HFRED2PRONGML", //! Table with 2prong
hf_charm_cand_reduced::MlScorePromptMassHypo1,
hf_charm_cand_reduced::MlScoreNonpromptMassHypo1);

// CAREFUL: need to follow convention [Name = Description + 's'] in DECLARE_SOA_TABLE(Name, "AOD", Description)
// to call DECLARE_SOA_INDEX_COLUMN_FULL later on
DECLARE_SOA_TABLE(HfRedSoftPiBases, "AOD", "HFREDSOFTPIBASE", //! Table with track information for reduced workflow
soa::Index<>,
hf_track_index_reduced::TrackId,
hf_track_index_reduced::HfRedCollisionId,
HFTRACKPAR_COLUMNS,
hf_track_vars_reduced::ItsNCls,
hf_track_vars_reduced::TpcNClsCrossedRows,
hf_track_vars_reduced::TpcChi2NCl,
aod::track::Px<aod::track::Signed1Pt, aod::track::Snp, aod::track::Alpha>,
aod::track::Py<aod::track::Signed1Pt, aod::track::Snp, aod::track::Alpha>,
aod::track::Pz<aod::track::Signed1Pt, track::Tgl>,
aod::track::PVector<aod::track::Signed1Pt, aod::track::Snp, aod::track::Alpha, aod::track::Tgl>);

DECLARE_SOA_TABLE(HfRedSoftPiCov, "AOD", "HFREDSOFTPICOV", //! Table with track covariance information for reduced workflow
soa::Index<>,
HFTRACKPARCOV_COLUMNS,
o2::soa::Marker<2>);

DECLARE_SOA_TABLE(HfRedSoftPiPid, "AOD", "HFREDSOFTPIPID",
soa::Index<>,
hf_cand_dstar::TPCNSigmaPiSoftPi,
hf_cand_dstar::TOFNSigmaPiSoftPi,
hf_track_vars_reduced::HasTOF,
hf_track_vars_reduced::HasTPC,
hf_cand_dstar::TPCTOFNSigmaPiSoftPi<hf_cand_dstar::TPCNSigmaPiSoftPi, hf_cand_dstar::TOFNSigmaPiSoftPi>)

namespace hf_track_index_reduced
{
DECLARE_SOA_INDEX_COLUMN_FULL(SoftPi, softPi, int, HfRedSoftPiBases, ""); //! ReducedCollision index
}; // namespace hf_track_index_reduced

// CAREFUL: need to follow convention [Name = Description + 's'] in DECLARE_SOA_TABLE(Name, "AOD", Description)
// to call DECLARE_SOA_INDEX_COLUMN_FULL later on
DECLARE_SOA_TABLE(HfRed3Prongs, "AOD", "HFRED3PRONG", //! Table with 3prong candidate information for reduced workflow
Expand Down Expand Up @@ -583,6 +604,17 @@ DECLARE_SOA_TABLE_VERSIONED(HfRed3ProngsMl_001, "AOD", "HFRED3PRONGML", 1, //! T

using HfRed3ProngsMl = HfRed3ProngsMl_001;

DECLARE_SOA_TABLE(HfRedMomDDaugs, "AOD", "HFREDMOMDDAUGS", //! Table with 2prong candidate ML scores
hf_cand::PxProng0,
hf_cand::PyProng0,
hf_cand::PzProng0,
hf_cand::PxProng1,
hf_cand::PyProng1,
hf_cand::PzProng1,
hf_cand::PxProng2,
hf_cand::PyProng2,
hf_cand::PzProng2);

// CAREFUL: need to follow convention [Name = Description + 's'] in DECLARE_SOA_TABLE(Name, "AOD", Description)
// to call DECLARE_SOA_INDEX_COLUMN_FULL later on
DECLARE_SOA_TABLE(HfRedJpsis, "AOD", "HFREDJPSI", //! Table with J/Psi candidate information for reduced workflow
Expand Down Expand Up @@ -711,11 +743,15 @@ using HfRedPidDau2s = HfRedPidDau2s_001;
using HfRedPidDau0 = HfRedPidDau0s::iterator;
using HfRedPidDau1 = HfRedPidDau1s::iterator;
using HfRedPidDau2 = HfRedPidDau2s::iterator;

// Beauty candidates prongs
namespace hf_cand_b0_reduced
{
DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, HfRed3Prongs, "_0"); //! Prong0 index
DECLARE_SOA_INDEX_COLUMN_FULL(Prong1, prong1, int, HfRedTrackBases, "_1"); //! Prong1 index
DECLARE_SOA_INDEX_COLUMN_FULL(ProngD0, prongD0, int, HfRed2Prongs, ""); //! ProngD0 index
DECLARE_SOA_INDEX_COLUMN_FULL(ProngSoftPi, prongSoftPi, int, HfRedTrackBases, ""); //! ProngSoftPi index
DECLARE_SOA_INDEX_COLUMN_FULL(ProngBachPi, prongBachPi, int, HfRedTrackBases, ""); //! ProngBachPi index
DECLARE_SOA_COLUMN(Prong0MlScoreBkg, prong0MlScoreBkg, float); //! Bkg ML score of the D daughter
DECLARE_SOA_COLUMN(Prong0MlScorePrompt, prong0MlScorePrompt, float); //! Prompt ML score of the D daughter
DECLARE_SOA_COLUMN(Prong0MlScoreNonprompt, prong0MlScoreNonprompt, float); //! Nonprompt ML score of the D daughter
Expand All @@ -724,13 +760,17 @@ DECLARE_SOA_COLUMN(Prong0MlScoreNonprompt, prong0MlScoreNonprompt, float); //! N
DECLARE_SOA_TABLE(HfRedB0Prongs, "AOD", "HFREDB0PRONG", //! Table with B0 daughter indices
hf_cand_b0_reduced::Prong0Id, hf_cand_b0_reduced::Prong1Id);

DECLARE_SOA_TABLE(HfRedB0ProngDStars, "AOD", "HFREDB0PRONGDST", //! Table with B0 daughter indices
hf_cand_b0_reduced::ProngD0Id, hf_cand_b0_reduced::ProngSoftPiId, hf_cand_b0_reduced::ProngBachPiId);

DECLARE_SOA_TABLE(HfRedB0DpMls, "AOD", "HFREDB0DPML", //! Table with ML scores for the D+ daughter
hf_cand_b0_reduced::Prong0MlScoreBkg,
hf_cand_b0_reduced::Prong0MlScorePrompt,
hf_cand_b0_reduced::Prong0MlScoreNonprompt,
o2::soa::Marker<1>);

using HfRedCandB0 = soa::Join<HfCandB0Ext, HfRedB0Prongs>;
using HfRedCandB0DStar = soa::Join<HfCandB0DStExt, HfRedB0ProngDStars>;

namespace hf_cand_bplus_reduced
{
Expand Down Expand Up @@ -848,6 +888,15 @@ DECLARE_SOA_TABLE(HfMcCheckDpPis, "AOD", "HFMCCHECKDPPI", //! Table with reconst
hf_b0_mc::PdgCodeProng3,
o2::soa::Marker<1>);

// table with results of reconstruction level MC matching
DECLARE_SOA_TABLE(HfMcRecRedDStarPis, "AOD", "HFMCRECREDDSTPI", //! Table with reconstructed MC information on DStarPi pairs for reduced workflow
hf_cand_b0_reduced::ProngD0Id,
hf_cand_b0_reduced::ProngBachPiId,
hf_cand_b0::FlagMcMatchRec,
hf_cand_b0::FlagWrongCollision,
hf_cand_b0::DebugMcRec,
hf_b0_mc::PtMother);

// Table with same size as HFCANDB0
DECLARE_SOA_TABLE(HfMcRecRedB0s, "AOD", "HFMCRECREDB0", //! Reconstruction-level MC information on B0 candidates for reduced workflow
hf_cand_b0::FlagMcMatchRec,
Expand Down
Loading
Loading