@@ -32,6 +32,8 @@ DECLARE_SOA_COLUMN(PtCand1, ptCand1, float); //! Transverse momentum of first
3232DECLARE_SOA_COLUMN (PtCand2, ptCand2, float ); // ! Transverse momentum of second candidate
3333DECLARE_SOA_COLUMN (YCand1, yCand1, float ); // ! Rapidity of first candidate
3434DECLARE_SOA_COLUMN (YCand2, yCand2, float ); // ! Rapidity of second candidate
35+ DECLARE_SOA_COLUMN (EtaCand1, etaCand1, float ); // ! Azimuthal angle of first candidate
36+ DECLARE_SOA_COLUMN (EtaCand2, etaCand2, float ); // ! Azimuthal angle of second candidate
3537DECLARE_SOA_COLUMN (PhiCand1, phiCand1, float ); // ! Azimuthal angle of first candidate
3638DECLARE_SOA_COLUMN (PhiCand2, phiCand2, float ); // ! Azimuthal angle of second candidate
3739// Invariant mass
@@ -55,12 +57,15 @@ DECLARE_SOA_COLUMN(MlProbD0barCand2, mlProbD0barCand2, std::vector<float>); //!
5557} // namespace hf_correlation_d_meson_pair
5658
5759// Definition of the D meson pair table. Contains the info needed at Data level.
60+ // NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
5861#define DECLARE_DMESON_PAIR_TABLE (_pair_type_, _marker_value_, _description_ ) \
5962 DECLARE_SOA_TABLE (_pair_type_, " AOD" , _description_, o2::soa::Marker<_marker_value_>, \
6063 hf_correlation_d_meson_pair::PtCand1, \
6164 hf_correlation_d_meson_pair::PtCand2, \
6265 hf_correlation_d_meson_pair::YCand1, \
6366 hf_correlation_d_meson_pair::YCand2, \
67+ hf_correlation_d_meson_pair::EtaCand1, \
68+ hf_correlation_d_meson_pair::EtaCand2, \
6469 hf_correlation_d_meson_pair::PhiCand1, \
6570 hf_correlation_d_meson_pair::PhiCand2, \
6671 hf_correlation_d_meson_pair::MDCand1, \
@@ -71,13 +76,15 @@ DECLARE_SOA_COLUMN(MlProbD0barCand2, mlProbD0barCand2, std::vector<float>); //!
7176 hf_correlation_d_meson_pair::CandidateType1, \
7277 hf_correlation_d_meson_pair::CandidateType2);
7378// Definition of the D meson pair table with info at MC level.
79+ // NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
7480#define DECLARE_DMESON_PAIR_MCINFO_TABLE (_pair_type_, _marker_value_, _description_ ) \
7581 DECLARE_SOA_TABLE (_pair_type_, " AOD" , _description_ " MCINFO" , o2::soa::Marker<_marker_value_>, \
7682 hf_correlation_d_meson_pair::Origin1, \
7783 hf_correlation_d_meson_pair::Origin2, \
7884 hf_correlation_d_meson_pair::MatchedMc1, \
7985 hf_correlation_d_meson_pair::MatchedMc2);
8086// Definition of the table with the ML info of the D meson pair.
87+ // NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
8188#define DECLARE_DMESON_PAIR_MLINFO_TABLE (_pair_type_, _marker_value_, _description_ ) \
8289 DECLARE_SOA_TABLE (_pair_type_, " AOD" , _description_ " ML" , o2::soa::Marker<_marker_value_>, \
8390 hf_correlation_d_meson_pair::MlProbD0Cand1, \
@@ -93,6 +100,47 @@ DECLARE_DMESON_PAIR_MLINFO_TABLE(D0PairMl, 1, "D0PAIR"); //! D0 pairs ML Inf
93100DECLARE_DMESON_PAIR_TABLE (D0PairMcGen, 2 , " D0PAIRGEN" ); // ! D0 pairs MC Gen Kinematic Info
94101DECLARE_DMESON_PAIR_MCINFO_TABLE (D0PairMcGenInfo, 2 , " D0PAIRGEN" ); // ! D0 pairs MC Gen Info
95102
103+ namespace hf_correlation_d_meson_had
104+ {
105+ // D candidate
106+ DECLARE_SOA_COLUMN (PtD, ptD, float ); // ! Transverse momentum of the D meson
107+ DECLARE_SOA_COLUMN (YD , yD, float ); // ! Rapidity of the D meson
108+ DECLARE_SOA_COLUMN (EtaD, etaD, float ); // ! Pseudorapidity of the D meson
109+ DECLARE_SOA_COLUMN (PhiD, phiD, float ); // ! Azimuthal angle of the D meson
110+ DECLARE_SOA_COLUMN (MD , mD , float ); // ! Invariant mass of the D meson
111+ DECLARE_SOA_COLUMN (PoolBinD, poolBinD, int ); // ! Pool bin of the D meson
112+ DECLARE_SOA_COLUMN (GIndexColD, gIndexColD , int ); // ! G-index column of the D meson
113+ DECLARE_SOA_COLUMN (TimestampD, timestampD, int64_t ); // ! Timestamp of the D meson
114+
115+ // Associated hadron
116+ DECLARE_SOA_COLUMN (PtHad, ptHad, float ); // ! Transverse momentum of the associated hadron
117+ DECLARE_SOA_COLUMN (YHad, yHad, float ); // ! Rapidity of the associated hadron
118+ DECLARE_SOA_COLUMN (EtaHad, etaHad, float ); // ! Pseudorapidity of the associated hadron
119+ DECLARE_SOA_COLUMN (PhiHad, phiHad, float ); // ! Azimuthal angle of the associated hadron
120+ DECLARE_SOA_COLUMN (PoolBinHad, poolBinHad, int ); // ! Pool bin of the associated hadron
121+ DECLARE_SOA_COLUMN (GIndexColHad, gIndexColHad , int ); // ! G-index column of the associated hadron
122+ DECLARE_SOA_COLUMN (TimestampHad, timestampHad, int64_t ); // ! Timestamp of the associated hadron
123+
124+ } // namespace hf_correlation_d_meson_had
125+
126+ // Definition of the D meson table for D-had correlations. Contains the info needed at Data level.
127+ DECLARE_SOA_TABLE (DMesonCandInfo, " AOD" , " DMESONCANDINFO" ,
128+ hf_correlation_d_meson_had::PtD,
129+ hf_correlation_d_meson_had::EtaD,
130+ hf_correlation_d_meson_had::PhiD,
131+ hf_correlation_d_meson_had::MD ,
132+ hf_correlation_d_meson_had::PoolBinD,
133+ hf_correlation_d_meson_had::GIndexColD,
134+ hf_correlation_d_meson_had::TimestampD);
135+
136+ DECLARE_SOA_TABLE (AssocHadInfo, " AOD" , " ASSOCHADINFO" ,
137+ hf_correlation_d_meson_had::PtHad,
138+ hf_correlation_d_meson_had::EtaHad,
139+ hf_correlation_d_meson_had::PhiHad,
140+ hf_correlation_d_meson_had::PoolBinHad,
141+ hf_correlation_d_meson_had::GIndexColHad,
142+ hf_correlation_d_meson_had::TimestampHad);
143+
96144} // namespace o2::aod
97145
98146#endif // PWGHF_HFC_DATAMODEL_DMESONPAIRSTABLES_H_
0 commit comments