Skip to content
111 changes: 58 additions & 53 deletions PWGHF/D2H/DataModel/ReducedDataModel.h
Original file line number Diff line number Diff line change
Expand Up @@ -846,6 +846,11 @@ DECLARE_SOA_TABLE(HfRedLbLcMls, "AOD", "HFREDLBLCML", //! Table with ML scores f

using HfRedCandLb = soa::Join<HfCandLbExt, HfRedLbProngs>;

namespace hf_cand_mc_flag
{
DECLARE_SOA_COLUMN(FlagWrongCollision, flagWrongCollision, int8_t); //! reconstruction level
}

namespace hf_b0_mc
{
// MC Rec
Expand Down Expand Up @@ -873,9 +878,9 @@ DECLARE_SOA_COLUMN(PdgCodeProng3, pdgCodeProng3, int); //! Pdg code
DECLARE_SOA_TABLE(HfMcRecRedDpPis, "AOD", "HFMCRECREDDPPI", //! Table with reconstructed MC information on DPi(<-B0) pairs for reduced workflow
hf_cand_b0_reduced::Prong0Id,
hf_cand_b0_reduced::Prong1Id,
hf_cand_b0::FlagMcMatchRec,
hf_cand_b0::FlagWrongCollision,
hf_cand_b0::DebugMcRec,
hf_cand_mc_flag::FlagMcMatchRec,
hf_cand_mc_flag::FlagWrongCollision,
hf_cand_mc_flag::DebugMcRec,
hf_b0_mc::PtMother);

// try with extended table ?
Expand All @@ -893,17 +898,17 @@ DECLARE_SOA_TABLE(HfMcCheckDpPis, "AOD", "HFMCCHECKDPPI", //! Table with reconst
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_cand_mc_flag::FlagMcMatchRec,
hf_cand_mc_flag::FlagWrongCollision,
hf_cand_mc_flag::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,
hf_cand_b0::FlagMcDecayChanRec,
hf_cand_b0::FlagWrongCollision,
hf_cand_b0::DebugMcRec,
hf_cand_mc_flag::FlagMcMatchRec,
hf_cand_mc_flag::FlagMcDecayChanRec,
hf_cand_mc_flag::FlagWrongCollision,
hf_cand_mc_flag::DebugMcRec,
hf_b0_mc::PtMother);

DECLARE_SOA_TABLE(HfMcCheckB0s, "AOD", "HFMCCHECKB0", //! Table with reconstructed MC information on B0 candidates for MC checks in reduced workflow
Expand All @@ -916,8 +921,8 @@ DECLARE_SOA_TABLE(HfMcCheckB0s, "AOD", "HFMCCHECKB0", //! Table with reconstruct
o2::soa::Marker<2>);

DECLARE_SOA_TABLE(HfMcGenRedB0s, "AOD", "HFMCGENREDB0", //! Generation-level MC information on B0 candidates for reduced workflow
hf_cand_b0::FlagMcMatchGen,
hf_cand_b0::FlagMcDecayChanRec,
hf_cand_mc_flag::FlagMcMatchGen,
hf_cand_mc_flag::FlagMcDecayChanRec,
hf_b0_mc::PtTrack,
hf_b0_mc::YTrack,
hf_b0_mc::EtaTrack,
Expand Down Expand Up @@ -969,19 +974,19 @@ DECLARE_SOA_COLUMN(PdgCodeProng2, pdgCodeProng2, int); //! Pdg code
DECLARE_SOA_TABLE(HfMcRecRedD0Pis, "AOD", "HFMCRECREDD0PI", //! Table with reconstructed MC information on D0Pi(<-B+) pairs for reduced workflow
hf_cand_bplus_reduced::Prong0Id,
hf_cand_bplus_reduced::Prong1Id,
hf_cand_bplus::FlagMcMatchRec,
hf_cand_bplus::FlagWrongCollision,
hf_cand_bplus::DebugMcRec,
hf_cand_mc_flag::FlagMcMatchRec,
hf_cand_mc_flag::FlagWrongCollision,
hf_cand_mc_flag::DebugMcRec,
hf_bplus_mc::PtMother);

// table with results of reconstruction level MC matching
DECLARE_SOA_TABLE(HfMcRecRedJPKs, "AOD", "HFMCRECREDJPK", //! Table with reconstructed MC information on J/PsiK(<-B+) pairs for reduced workflow
hf_cand_bplus_reduced::JpsiId,
hf_cand_bplus_reduced::BachKaId,
hf_cand_bplus::FlagMcMatchRec,
hf_cand_bplus::FlagMcDecayChanRec,
hf_cand_bplus::FlagWrongCollision,
hf_cand_bplus::DebugMcRec,
hf_cand_mc_flag::FlagMcMatchRec,
hf_cand_mc_flag::FlagMcDecayChanRec,
hf_cand_mc_flag::FlagWrongCollision,
hf_cand_mc_flag::DebugMcRec,
hf_bplus_mc::PtMother);

// DECLARE_SOA_EXTENDED_TABLE_USER(ExTable, Tracks, "EXTABLE",
Expand All @@ -995,10 +1000,10 @@ DECLARE_SOA_TABLE(HfMcCheckD0Pis, "AOD", "HFMCCHECKD0PI", //! Table with reconst

// Table with same size as HFCANDBPLUS
DECLARE_SOA_TABLE(HfMcRecRedBps, "AOD", "HFMCRECREDBP", //! Reconstruction-level MC information on B+ candidates for reduced workflow
hf_cand_bplus::FlagMcMatchRec,
hf_cand_bplus::FlagMcDecayChanRec,
hf_cand_bplus::FlagWrongCollision,
hf_cand_bplus::DebugMcRec,
hf_cand_mc_flag::FlagMcMatchRec,
hf_cand_mc_flag::FlagMcDecayChanRec,
hf_cand_mc_flag::FlagWrongCollision,
hf_cand_mc_flag::DebugMcRec,
hf_bplus_mc::PtMother);

DECLARE_SOA_TABLE(HfMcCheckBps, "AOD", "HFMCCHECKBP", //! Table with reconstructed MC information on B+ candidates for MC checks in reduced workflow
Expand All @@ -1010,8 +1015,8 @@ DECLARE_SOA_TABLE(HfMcCheckBps, "AOD", "HFMCCHECKBP", //! Table with reconstruct
o2::soa::Marker<2>);

DECLARE_SOA_TABLE(HfMcGenRedBps, "AOD", "HFMCGENREDBP", //! Generation-level MC information on B+ candidates for reduced workflow
hf_cand_bplus::FlagMcMatchGen,
hf_cand_bplus::FlagMcDecayChanRec,
hf_cand_mc_flag::FlagMcMatchGen,
hf_cand_mc_flag::FlagMcDecayChanRec,
hf_bplus_mc::PtTrack,
hf_bplus_mc::YTrack,
hf_bplus_mc::EtaTrack,
Expand Down Expand Up @@ -1070,20 +1075,20 @@ DECLARE_SOA_COLUMN(PdgCodeProng3, pdgCodeProng3, int); //! Pdg code
DECLARE_SOA_TABLE(HfMcRecRedDsPis, "AOD", "HFMCRECREDDSPI", //! Table with reconstructed MC information on DsPi(<-Bs) pairs for reduced workflow
hf_cand_bs_reduced::Prong0Id,
hf_cand_bs_reduced::Prong1Id,
hf_cand_bs::FlagMcMatchRec,
hf_cand_bs::FlagWrongCollision,
hf_cand_bs::DebugMcRec,
hf_cand_mc_flag::FlagMcMatchRec,
hf_cand_mc_flag::FlagWrongCollision,
hf_cand_mc_flag::DebugMcRec,
hf_bs_mc::PtMother);

// table with results of reconstruction level MC matching
DECLARE_SOA_TABLE(HfMcRecRedJPPhis, "AOD", "HFMCRECREDJPPHI", //! Table with reconstructed MC information on DsPi(<-Bs) pairs for reduced workflow
hf_cand_bs_reduced::JpsiId,
hf_cand_bs_reduced::Prong0PhiId,
hf_cand_bs_reduced::Prong1PhiId,
hf_cand_bs::FlagMcMatchRec,
hf_cand_bs::FlagMcDecayChanRec,
hf_cand_bs::FlagWrongCollision,
hf_cand_bs::DebugMcRec,
hf_cand_mc_flag::FlagMcMatchRec,
hf_cand_mc_flag::FlagMcDecayChanRec,
hf_cand_mc_flag::FlagWrongCollision,
hf_cand_mc_flag::DebugMcRec,
hf_bs_mc::PtMother);

// try with extended table ?
Expand All @@ -1099,10 +1104,10 @@ DECLARE_SOA_TABLE(HfMcCheckDsPis, "AOD", "HFMCCHECKDSPI", //! Table with reconst

// Table with same size as HFCANDBS
DECLARE_SOA_TABLE(HfMcRecRedBss, "AOD", "HFMCRECREDBS", //! Reconstruction-level MC information on Bs candidates for reduced workflow
hf_cand_bs::FlagMcMatchRec,
hf_cand_bs::FlagMcDecayChanRec,
hf_cand_bs::FlagWrongCollision,
hf_cand_bs::DebugMcRec,
hf_cand_mc_flag::FlagMcMatchRec,
hf_cand_mc_flag::FlagMcDecayChanRec,
hf_cand_mc_flag::FlagWrongCollision,
hf_cand_mc_flag::DebugMcRec,
hf_bs_mc::PtMother);

DECLARE_SOA_TABLE(HfMcCheckBss, "AOD", "HFMCCHECKBS", //! Table with reconstructed MC information on Bs candidates for MC checks in reduced workflow
Expand All @@ -1115,8 +1120,8 @@ DECLARE_SOA_TABLE(HfMcCheckBss, "AOD", "HFMCCHECKBS", //! Table with reconstruct
o2::soa::Marker<2>);

DECLARE_SOA_TABLE(HfMcGenRedBss, "AOD", "HFMCGENREDBS", //! Generation-level MC information on Bs candidates for reduced workflow
hf_cand_bs::FlagMcMatchGen,
hf_cand_bs::FlagMcDecayChanRec,
hf_cand_mc_flag::FlagMcMatchGen,
hf_cand_mc_flag::FlagMcDecayChanRec,
hf_bs_mc::PtTrack,
hf_bs_mc::YTrack,
hf_bs_mc::EtaTrack,
Expand Down Expand Up @@ -1172,9 +1177,9 @@ DECLARE_SOA_COLUMN(PdgCodeProng3, pdgCodeProng3, int); //! Pdg code
DECLARE_SOA_TABLE(HfMcRecRedLcPis, "AOD", "HFMCRECREDLCPI", //! Table with reconstructed MC information on LcPi(<-Lb) pairs for reduced workflow
hf_cand_lb_reduced::Prong0Id,
hf_cand_lb_reduced::Prong1Id,
hf_cand_lb::FlagMcMatchRec,
hf_cand_lb::FlagWrongCollision,
hf_cand_lb::DebugMcRec,
hf_cand_mc_flag::FlagMcMatchRec,
hf_cand_mc_flag::FlagWrongCollision,
hf_cand_mc_flag::DebugMcRec,
hf_lb_mc::PtMother);

DECLARE_SOA_TABLE(HfMcCheckLcPis, "AOD", "HFMCCHECKLCPI", //! Table with reconstructed MC information on LcPi(<-Lb) pairs for MC checks in reduced workflow
Expand All @@ -1188,9 +1193,9 @@ DECLARE_SOA_TABLE(HfMcCheckLcPis, "AOD", "HFMCCHECKLCPI", //! Table with reconst

// Table with same size as HFCANDLc
DECLARE_SOA_TABLE(HfMcRecRedLbs, "AOD", "HFMCRECREDLB", //! Reconstruction-level MC information on Lb candidates for reduced workflow
hf_cand_lb::FlagMcMatchRec,
hf_cand_lb::FlagWrongCollision,
hf_cand_lb::DebugMcRec,
hf_cand_mc_flag::FlagMcMatchRec,
hf_cand_mc_flag::FlagWrongCollision,
hf_cand_mc_flag::DebugMcRec,
hf_lb_mc::PtMother);

DECLARE_SOA_TABLE(HfMcCheckLbs, "AOD", "HFMCCHECKLB", //! Table with reconstructed MC information on Lb candidates for MC checks in reduced workflow
Expand All @@ -1203,7 +1208,7 @@ DECLARE_SOA_TABLE(HfMcCheckLbs, "AOD", "HFMCCHECKLB", //! Table with reconstruct
o2::soa::Marker<2>);

DECLARE_SOA_TABLE(HfMcGenRedLbs, "AOD", "HFMCGENREDLB", //! Generation-level MC information on Lb candidates for reduced workflow
hf_cand_lb::FlagMcMatchGen,
hf_cand_mc_flag::FlagMcMatchGen,
hf_lb_mc::PtTrack,
hf_lb_mc::YTrack,
hf_lb_mc::EtaTrack,
Expand Down Expand Up @@ -1553,7 +1558,7 @@ DECLARE_SOA_TABLE(Hf3PrV0McRec, "AOD", "HF3PRV0MCREC",
hf_reso_cand_reduced::Origin,
hf_reso_cand_reduced::PtGen,
hf_reso_cand_reduced::InvMassGen,
hf_cand::NTracksDecayed,
hf_cand_mc_flag::NTracksDecayed,
o2::soa::Marker<1>);

DECLARE_SOA_TABLE(HfDstarV0McRec, "AOD", "HFDSTARV0MCREC",
Expand All @@ -1566,7 +1571,7 @@ DECLARE_SOA_TABLE(HfDstarV0McRec, "AOD", "HFDSTARV0MCREC",
hf_reso_cand_reduced::Origin,
hf_reso_cand_reduced::PtGen,
hf_reso_cand_reduced::InvMassGen,
hf_cand::NTracksDecayed,
hf_cand_mc_flag::NTracksDecayed,
o2::soa::Marker<1>);

DECLARE_SOA_TABLE(Hf2PrV0McRec, "AOD", "HF2PRV0MCREC",
Expand All @@ -1579,7 +1584,7 @@ DECLARE_SOA_TABLE(Hf2PrV0McRec, "AOD", "HF2PRV0MCREC",
hf_reso_cand_reduced::Origin,
hf_reso_cand_reduced::PtGen,
hf_reso_cand_reduced::InvMassGen,
hf_cand::NTracksDecayed,
hf_cand_mc_flag::NTracksDecayed,
o2::soa::Marker<1>);

DECLARE_SOA_TABLE(Hf3PrTrkMcRec, "AOD", "HF3PRTRKMCREC",
Expand All @@ -1592,7 +1597,7 @@ DECLARE_SOA_TABLE(Hf3PrTrkMcRec, "AOD", "HF3PRTRKMCREC",
hf_reso_cand_reduced::Origin,
hf_reso_cand_reduced::PtGen,
hf_reso_cand_reduced::InvMassGen,
hf_cand::NTracksDecayed,
hf_cand_mc_flag::NTracksDecayed,
o2::soa::Marker<1>);

DECLARE_SOA_TABLE(HfDstarTrkMcRec, "AOD", "HFDSTARTRKMCREC",
Expand All @@ -1605,7 +1610,7 @@ DECLARE_SOA_TABLE(HfDstarTrkMcRec, "AOD", "HFDSTARTRKMCREC",
hf_reso_cand_reduced::Origin,
hf_reso_cand_reduced::PtGen,
hf_reso_cand_reduced::InvMassGen,
hf_cand::NTracksDecayed,
hf_cand_mc_flag::NTracksDecayed,
o2::soa::Marker<1>);

DECLARE_SOA_TABLE(Hf2PrTrkMcRec, "AOD", "HF2PRTRKMCREC",
Expand All @@ -1618,11 +1623,11 @@ DECLARE_SOA_TABLE(Hf2PrTrkMcRec, "AOD", "HF2PRTRKMCREC",
hf_reso_cand_reduced::Origin,
hf_reso_cand_reduced::PtGen,
hf_reso_cand_reduced::InvMassGen,
hf_cand::NTracksDecayed,
hf_cand_mc_flag::NTracksDecayed,
o2::soa::Marker<1>);

DECLARE_SOA_TABLE(HfMcGenRedResos, "AOD", "HFMCGENREDRESO", //! Generation-level MC information on Ds-Resonances candidates for reduced workflow
hf_cand_b0::FlagMcMatchGen,
hf_cand_mc_flag::FlagMcMatchGen,
hf_reso_cand_reduced::Origin,
hf_b0_mc::PtTrack,
hf_b0_mc::YTrack,
Expand All @@ -1646,7 +1651,7 @@ DECLARE_SOA_TABLE(HfMcRecRedResos, "AOD", "HFMCRECREDRESO", //! Reconstruction-l
hf_reso_cand_reduced::Origin,
hf_reso_cand_reduced::PtGen,
hf_reso_cand_reduced::InvMassGen,
hf_cand::NTracksDecayed,
hf_cand_mc_flag::NTracksDecayed,
o2::soa::Marker<1>);
} // namespace aod

Expand Down
6 changes: 3 additions & 3 deletions PWGHF/D2H/Tasks/taskB0Reduced.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -152,13 +152,13 @@ DECLARE_SOA_TABLE(HfRedCandB0Lites, "AOD", "HFREDCANDB0LITE", //! Table with som
hf_cand_b0_lite::NSigTofPiBachelor,
hf_cand_b0_lite::NSigTpcTofPiBachelor,
// MC truth
hf_cand_3prong::FlagMcMatchRec,
hf_cand_3prong::OriginMcRec,
hf_cand_mc_flag::FlagMcMatchRec,
hf_cand_mc_flag::OriginMcRec,
hf_cand_b0_lite::FlagWrongCollision,
hf_cand_b0_lite::PtGen);

DECLARE_SOA_TABLE(HfRedB0McCheck, "AOD", "HFREDB0MCCHECK", //! Table with MC decay type check
hf_cand_3prong::FlagMcMatchRec,
hf_cand_mc_flag::FlagMcMatchRec,
hf_cand_b0_lite::FlagWrongCollision,
hf_cand_b0_lite::MD,
hf_cand_b0_lite::PtD,
Expand Down
6 changes: 3 additions & 3 deletions PWGHF/D2H/Tasks/taskBplusReduced.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,13 @@ DECLARE_SOA_TABLE(HfRedCandBpLites, "AOD", "HFREDCANDBPLITE", //! Table with som
hf_cand_bplus_lite::NSigTofPiBachelor,
hf_cand_bplus_lite::NSigTpcTofPiBachelor,
// MC truth
hf_cand_2prong::FlagMcMatchRec,
hf_cand_2prong::OriginMcRec,
hf_cand_mc_flag::FlagMcMatchRec,
hf_cand_mc_flag::OriginMcRec,
hf_cand_bplus_lite::FlagWrongCollision,
hf_cand_bplus_lite::PtGen);

DECLARE_SOA_TABLE(HfRedBpMcCheck, "AOD", "HFREDBPMCCHECK", //! Table with MC decay type check
hf_cand_2prong::FlagMcMatchRec,
hf_cand_mc_flag::FlagMcMatchRec,
hf_cand_bplus_lite::FlagWrongCollision,
hf_cand_bplus_lite::MD,
hf_cand_bplus_lite::PtD,
Expand Down
8 changes: 4 additions & 4 deletions PWGHF/D2H/Tasks/taskBplusToJpsiKReduced.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -164,14 +164,14 @@ DECLARE_SOA_TABLE(HfRedCandBpLites, "AOD", "HFREDCANDBPLITE", //! Table with som
hf_cand_bplustojpsik_lite::NSigTofKaBachelor,
hf_cand_bplustojpsik_lite::NSigTpcTofKaBachelor,
// MC truth
hf_cand_bplus::FlagMcMatchRec,
hf_cand_bplus::FlagMcDecayChanRec,
hf_cand_bplus::OriginMcRec,
hf_cand_mc_flag::FlagMcMatchRec,
hf_cand_mc_flag::FlagMcDecayChanRec,
hf_cand_mc_flag::OriginMcRec,
hf_cand_bplustojpsik_lite::FlagWrongCollision,
hf_cand_bplustojpsik_lite::PtGen);

// DECLARE_SOA_TABLE(HfRedBpMcCheck, "AOD", "HFREDBPMCCHECK", //! Table with MC decay type check
// hf_cand_2prong::FlagMcMatchRec,
// hf_cand_mc_flag::FlagMcMatchRec,
// hf_cand_bplustojpsik_lite::FlagWrongCollision,
// hf_cand_bplustojpsik_lite::MJpsi,
// hf_cand_bplustojpsik_lite::PtJpsi,
Expand Down
6 changes: 3 additions & 3 deletions PWGHF/D2H/Tasks/taskBsReduced.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -155,13 +155,13 @@ DECLARE_SOA_TABLE(HfRedCandBsLites, "AOD", "HFREDCANDBSLITE", //! Table with som
hf_cand_bs_lite::NSigTofPiProng1,
hf_cand_bs_lite::NSigTpcTofPiProng1,
// MC truth
hf_cand_3prong::FlagMcMatchRec,
hf_cand_3prong::OriginMcRec,
hf_cand_mc_flag::FlagMcMatchRec,
hf_cand_mc_flag::OriginMcRec,
hf_cand_bs_lite::FlagWrongCollision,
hf_cand_bs_lite::PtGen);

DECLARE_SOA_TABLE(HfRedBsMcCheck, "AOD", "HFREDBSMCCHECK", //! Table with MC decay type check
hf_cand_3prong::FlagMcMatchRec,
hf_cand_mc_flag::FlagMcMatchRec,
hf_cand_bs_lite::FlagWrongCollision,
hf_cand_bs_lite::MProng0,
hf_cand_bs_lite::PtProng0,
Expand Down
8 changes: 4 additions & 4 deletions PWGHF/D2H/Tasks/taskBsToJpsiPhiReduced.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -189,14 +189,14 @@ DECLARE_SOA_TABLE(HfRedCandBsLites, "AOD", "HFREDCANDBSLITE", //! Table with som
hf_cand_bstojpsiphi_lite::NSigTofKaBachelor1,
hf_cand_bstojpsiphi_lite::NSigTpcTofKaBachelor1,
// MC truth
hf_cand_bs::FlagMcMatchRec,
hf_cand_bs::FlagMcDecayChanRec,
hf_cand_bs::OriginMcRec,
hf_cand_mc_flag::FlagMcMatchRec,
hf_cand_mc_flag::FlagMcDecayChanRec,
hf_cand_mc_flag::OriginMcRec,
hf_cand_bstojpsiphi_lite::FlagWrongCollision,
hf_cand_bstojpsiphi_lite::PtGen);

// DECLARE_SOA_TABLE(HfRedBsMcCheck, "AOD", "HFREDBPMCCHECK", //! Table with MC decay type check
// hf_cand_2prong::FlagMcMatchRec,
// hf_cand_mc_flag::FlagMcMatchRec,
// hf_cand_bstojpsiphi_lite::FlagWrongCollision,
// hf_cand_bstojpsiphi_lite::MJpsi,
// hf_cand_bstojpsiphi_lite::PtJpsi,
Expand Down
Loading
Loading