Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
123 changes: 65 additions & 58 deletions PWGHF/D2H/DataModel/ReducedDataModel.h
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@
DECLARE_SOA_COLUMN(TpcChi2NClProngMax, tpcChi2NClProngMax, float); //! maximum value of TPC chi2 for the decay daughter tracks
DECLARE_SOA_COLUMN(PtProngMin, ptProngMin, float); //! minimum value of transverse momentum for the decay daughter tracks
DECLARE_SOA_COLUMN(AbsEtaProngMin, absEtaProngMin, float); //! minimum value of absolute pseudorapidity for the decay daughter tracks
DECLARE_SOA_COLUMN(TrackType, tracktype, uint8_t); //! particle type according to PID selection (pion, kaon, proton)

Check failure on line 199 in PWGHF/D2H/DataModel/ReducedDataModel.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column]

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.

// dynamic columns
DECLARE_SOA_DYNAMIC_COLUMN(Pt, pt, //! transverse momentum
Expand Down Expand Up @@ -846,11 +847,6 @@

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 @@ -878,9 +874,9 @@
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_mc_flag::FlagMcMatchRec,
hf_cand_mc_flag::FlagWrongCollision,
hf_cand_mc_flag::DebugMcRec,
hf_cand_b0::FlagMcMatchRec,
hf_cand_b0::FlagWrongCollision,
hf_cand_b0::DebugMcRec,
hf_b0_mc::PtMother);

// try with extended table ?
Expand All @@ -898,17 +894,17 @@
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_mc_flag::FlagMcMatchRec,
hf_cand_mc_flag::FlagWrongCollision,
hf_cand_mc_flag::DebugMcRec,
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_mc_flag::FlagMcMatchRec,
hf_cand_mc_flag::FlagMcDecayChanRec,
hf_cand_mc_flag::FlagWrongCollision,
hf_cand_mc_flag::DebugMcRec,
hf_cand_b0::FlagMcMatchRec,
hf_cand_b0::FlagMcDecayChanRec,
hf_cand_b0::FlagWrongCollision,
hf_cand_b0::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 @@ -921,8 +917,8 @@
o2::soa::Marker<2>);

DECLARE_SOA_TABLE(HfMcGenRedB0s, "AOD", "HFMCGENREDB0", //! Generation-level MC information on B0 candidates for reduced workflow
hf_cand_mc_flag::FlagMcMatchGen,
hf_cand_mc_flag::FlagMcDecayChanRec,
hf_cand_b0::FlagMcMatchGen,
hf_cand_b0::FlagMcDecayChanRec,
hf_b0_mc::PtTrack,
hf_b0_mc::YTrack,
hf_b0_mc::EtaTrack,
Expand Down Expand Up @@ -974,19 +970,19 @@
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_mc_flag::FlagMcMatchRec,
hf_cand_mc_flag::FlagWrongCollision,
hf_cand_mc_flag::DebugMcRec,
hf_cand_bplus::FlagMcMatchRec,
hf_cand_bplus::FlagWrongCollision,
hf_cand_bplus::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_mc_flag::FlagMcMatchRec,
hf_cand_mc_flag::FlagMcDecayChanRec,
hf_cand_mc_flag::FlagWrongCollision,
hf_cand_mc_flag::DebugMcRec,
hf_cand_bplus::FlagMcMatchRec,
hf_cand_bplus::FlagMcDecayChanRec,
hf_cand_bplus::FlagWrongCollision,
hf_cand_bplus::DebugMcRec,
hf_bplus_mc::PtMother);

// DECLARE_SOA_EXTENDED_TABLE_USER(ExTable, Tracks, "EXTABLE",
Expand All @@ -1000,10 +996,10 @@

// Table with same size as HFCANDBPLUS
DECLARE_SOA_TABLE(HfMcRecRedBps, "AOD", "HFMCRECREDBP", //! Reconstruction-level MC information on B+ candidates for reduced workflow
hf_cand_mc_flag::FlagMcMatchRec,
hf_cand_mc_flag::FlagMcDecayChanRec,
hf_cand_mc_flag::FlagWrongCollision,
hf_cand_mc_flag::DebugMcRec,
hf_cand_bplus::FlagMcMatchRec,
hf_cand_bplus::FlagMcDecayChanRec,
hf_cand_bplus::FlagWrongCollision,
hf_cand_bplus::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 @@ -1015,8 +1011,8 @@
o2::soa::Marker<2>);

DECLARE_SOA_TABLE(HfMcGenRedBps, "AOD", "HFMCGENREDBP", //! Generation-level MC information on B+ candidates for reduced workflow
hf_cand_mc_flag::FlagMcMatchGen,
hf_cand_mc_flag::FlagMcDecayChanRec,
hf_cand_bplus::FlagMcMatchGen,
hf_cand_bplus::FlagMcDecayChanRec,
hf_bplus_mc::PtTrack,
hf_bplus_mc::YTrack,
hf_bplus_mc::EtaTrack,
Expand Down Expand Up @@ -1075,20 +1071,20 @@
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_mc_flag::FlagMcMatchRec,
hf_cand_mc_flag::FlagWrongCollision,
hf_cand_mc_flag::DebugMcRec,
hf_cand_bs::FlagMcMatchRec,
hf_cand_bs::FlagWrongCollision,
hf_cand_bs::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_mc_flag::FlagMcMatchRec,
hf_cand_mc_flag::FlagMcDecayChanRec,
hf_cand_mc_flag::FlagWrongCollision,
hf_cand_mc_flag::DebugMcRec,
hf_cand_bs::FlagMcMatchRec,
hf_cand_bs::FlagMcDecayChanRec,
hf_cand_bs::FlagWrongCollision,
hf_cand_bs::DebugMcRec,
hf_bs_mc::PtMother);

// try with extended table ?
Expand All @@ -1104,10 +1100,10 @@

// Table with same size as HFCANDBS
DECLARE_SOA_TABLE(HfMcRecRedBss, "AOD", "HFMCRECREDBS", //! Reconstruction-level MC information on Bs candidates for reduced workflow
hf_cand_mc_flag::FlagMcMatchRec,
hf_cand_mc_flag::FlagMcDecayChanRec,
hf_cand_mc_flag::FlagWrongCollision,
hf_cand_mc_flag::DebugMcRec,
hf_cand_bs::FlagMcMatchRec,
hf_cand_bs::FlagMcDecayChanRec,
hf_cand_bs::FlagWrongCollision,
hf_cand_bs::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 @@ -1120,8 +1116,8 @@
o2::soa::Marker<2>);

DECLARE_SOA_TABLE(HfMcGenRedBss, "AOD", "HFMCGENREDBS", //! Generation-level MC information on Bs candidates for reduced workflow
hf_cand_mc_flag::FlagMcMatchGen,
hf_cand_mc_flag::FlagMcDecayChanRec,
hf_cand_bs::FlagMcMatchGen,
hf_cand_bs::FlagMcDecayChanRec,
hf_bs_mc::PtTrack,
hf_bs_mc::YTrack,
hf_bs_mc::EtaTrack,
Expand Down Expand Up @@ -1177,9 +1173,9 @@
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_mc_flag::FlagMcMatchRec,
hf_cand_mc_flag::FlagWrongCollision,
hf_cand_mc_flag::DebugMcRec,
hf_cand_lb::FlagMcMatchRec,
hf_cand_lb::FlagWrongCollision,
hf_cand_lb::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 @@ -1193,9 +1189,9 @@

// Table with same size as HFCANDLc
DECLARE_SOA_TABLE(HfMcRecRedLbs, "AOD", "HFMCRECREDLB", //! Reconstruction-level MC information on Lb candidates for reduced workflow
hf_cand_mc_flag::FlagMcMatchRec,
hf_cand_mc_flag::FlagWrongCollision,
hf_cand_mc_flag::DebugMcRec,
hf_cand_lb::FlagMcMatchRec,
hf_cand_lb::FlagWrongCollision,
hf_cand_lb::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 @@ -1208,7 +1204,7 @@
o2::soa::Marker<2>);

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

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

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

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

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

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

DECLARE_SOA_TABLE(HfMcGenRedResos, "AOD", "HFMCGENREDRESO", //! Generation-level MC information on Ds-Resonances candidates for reduced workflow
hf_cand_mc_flag::FlagMcMatchGen,
hf_cand_b0::FlagMcMatchGen,
hf_reso_cand_reduced::Origin,
hf_b0_mc::PtTrack,
hf_b0_mc::YTrack,
Expand All @@ -1651,8 +1647,19 @@
hf_reso_cand_reduced::Origin,
hf_reso_cand_reduced::PtGen,
hf_reso_cand_reduced::InvMassGen,
hf_cand_mc_flag::NTracksDecayed,
hf_cand::NTracksDecayed,
o2::soa::Marker<1>);
DECLARE_SOA_TABLE(HcSelTracks, "AOD", "HCSELTRACKS", //! Table with selected tracks for Hc analysis
o2::soa::Index<>,
// Indices
hf_track_index_reduced::TrackId,
hf_track_index_reduced::HfRedCollisionId,
// Static
hf_track_vars_reduced::Px,
hf_track_vars_reduced::Py,
hf_track_vars_reduced::Pz,
hf_track_vars_reduced::Sign,
hf_track_vars_reduced::TrackType);
} // namespace aod

namespace soa
Expand Down
5 changes: 5 additions & 0 deletions PWGHF/D2H/TableProducer/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@ o2physics_add_dpl_workflow(data-creator-jpsi-had-reduced
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::EventFilteringUtils
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(data-creator-hidden-charm-reduced
SOURCES dataCreatorHiddenCharmReduced.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::EventFilteringUtils
COMPONENT_NAME Analysis)

# Converters

o2physics_add_dpl_workflow(converter-reduced-3-prongs-ml
Expand Down
Loading
Loading