Skip to content

Commit 5539e6e

Browse files
MarcellocostiMarcellocosti
committed
Avoid pair repetition in Had-Had case and renamings
1 parent 550c7ee commit 5539e6e

File tree

3 files changed

+210
-106
lines changed

3 files changed

+210
-106
lines changed

‎PWGHF/HFC/DataModel/DerivedDataCorrelationTables.h‎

Lines changed: 69 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -106,30 +106,33 @@ DECLARE_SOA_TABLE(AssocTrackSels, "AOD", "ASSOCTRACKSEL", //! Table with associa
106106
// definition of columns and tables for Charm-Hadron and Hadron-Hadron correlation pairs
107107
namespace hf_correl_charm_had_reduced
108108
{
109+
// Correlation columns
109110
DECLARE_SOA_INDEX_COLUMN(HfcRedCorrColl, hfcRedCorrColl); //! ReducedCollision index
110111
DECLARE_SOA_COLUMN(DeltaPhi, deltaPhi, float); //! DeltaPhi between charm hadron and Hadrons
111112
DECLARE_SOA_COLUMN(DeltaEta, deltaEta, float); //! DeltaEta between charm hadron and Hadrons
112113
DECLARE_SOA_COLUMN(PoolBin, poolBin, int); //! Pool Bin for the MixedEvent
114+
// General trigger particle columns
113115
DECLARE_SOA_COLUMN(PhiTrig, phiTrig, float); //! Phi of the trigger candidate
114116
DECLARE_SOA_COLUMN(EtaTrig, etaTrig, float); //! Eta of the trigger candidate
115117
DECLARE_SOA_COLUMN(PtTrig, ptTrig, float); //! Pt of the trigger candidate
118+
// Charm trigger particle selection columns
116119
DECLARE_SOA_COLUMN(InvMassTrig, invMassTrig, float); //! Invariant mass of Charm trigger candidate
117120
DECLARE_SOA_COLUMN(BdtScore0Trig, bdtScore0Trig, float); //! First BDT output score
118121
DECLARE_SOA_COLUMN(BdtScore1Trig, bdtScore1Trig, float); //! Second BDT output score
122+
// Hadron trigger particle selection columns
119123
DECLARE_SOA_COLUMN(NTpcCrossedRowsTrig, nTpcCrossedRowsTrig, int); //! Number of crossed TPC Rows
120124
DECLARE_SOA_COLUMN(ItsClsMapTrig, itsClsMapTrig, int); //! ITS cluster map, one bit per a layer, starting from the innermost
121125
DECLARE_SOA_COLUMN(ItsNClsTrig, itsNClsTrig, int); //! Number of ITS clusters
122-
DECLARE_SOA_COLUMN(EtaTrigTrack, etaTrigTrack, float); //! Eta of the track
123-
DECLARE_SOA_COLUMN(PhiTrigTrack, phiTrigTrack, float); //! Phi of the track
124-
DECLARE_SOA_COLUMN(PtTrigTrack, ptTrigTrack, float); //! Pt of the track
125126
DECLARE_SOA_COLUMN(DcaXYTrig, dcaXYTrig, float); //! Impact parameter in XY of the track to the primary vertex
126127
DECLARE_SOA_COLUMN(DcaZTrig, dcaZTrig, float); //! Impact parameter in Z of the track to the primary vertex
128+
// General associated particle columns
129+
DECLARE_SOA_COLUMN(EtaAssoc, etaAssoc, float); //! Eta of the associated candidate
130+
DECLARE_SOA_COLUMN(PhiAssoc, phiAssoc, float); //! Phi of the associated candidate
131+
DECLARE_SOA_COLUMN(PtAssoc, ptAssoc, float); //! Pt of the associated candidate
132+
// Hadron associated particle selection columns
127133
DECLARE_SOA_COLUMN(NTpcCrossedRowsAssoc, nTpcCrossedRowsAssoc, int); //! Number of crossed TPC Rows
128134
DECLARE_SOA_COLUMN(ItsClsMapAssoc, itsClsMapAssoc, int); //! ITS cluster map, one bit per a layer, starting from the innermost
129135
DECLARE_SOA_COLUMN(ItsNClsAssoc, itsNClsAssoc, int); //! Number of ITS clusters
130-
DECLARE_SOA_COLUMN(EtaAssoc, etaAssoc, float); //! Eta of the track
131-
DECLARE_SOA_COLUMN(PhiAssoc, phiAssoc, float); //! Phi of the track
132-
DECLARE_SOA_COLUMN(PtAssoc, ptAssoc, float); //! Pt of the track
133136
DECLARE_SOA_COLUMN(DcaXYAssoc, dcaXYAssoc, float); //! Impact parameter in XY of the track to the primary vertex
134137
DECLARE_SOA_COLUMN(DcaZAssoc, dcaZAssoc, float); //! Impact parameter in Z of the track to the primary vertex
135138
} // namespace hf_correl_charm_had_reduced
@@ -146,21 +149,21 @@ DECLARE_SOA_TABLE(HfcRedTrigCharms, "AOD", "HFCREDTRIGCHARM", //! Table with Sam
146149
aod::hf_correl_charm_had_reduced::BdtScore0Trig,
147150
aod::hf_correl_charm_had_reduced::BdtScore1Trig);
148151

149-
DECLARE_SOA_TABLE(HfcRedTrigTrks, "AOD", "HFCREDTRIGTRK", //! Table with Same Event Charm-Hadron pairs information
152+
DECLARE_SOA_TABLE(HfcRedTrigTracks, "AOD", "HFCREDTRIGTRACK", //! Table with Same Event Charm-Hadron pairs information
150153
aod::hf_correl_charm_had_reduced::NTpcCrossedRowsTrig,
151154
aod::hf_correl_charm_had_reduced::ItsClsMapTrig,
152155
aod::hf_correl_charm_had_reduced::ItsNClsTrig,
153156
aod::hf_correl_charm_had_reduced::DcaXYTrig,
154157
aod::hf_correl_charm_had_reduced::DcaZTrig);
155158

156-
DECLARE_SOA_TABLE(HfcRedAssocBases, "AOD", "HFCREDASSOCBASE", //! Table with associated candidate base info
159+
DECLARE_SOA_TABLE(HfcRedAssBases, "AOD", "HFCREDASSBASE", //! Table with associated candidate base info
157160
soa::Index<>,
158161
aod::hf_correl_charm_had_reduced::HfcRedCorrCollId,
159162
aod::hf_correl_charm_had_reduced::PhiAssoc,
160163
aod::hf_correl_charm_had_reduced::EtaAssoc,
161164
aod::hf_correl_charm_had_reduced::PtAssoc);
162165

163-
DECLARE_SOA_TABLE(HfcRedAssocTrks, "AOD", "HFCREDASSOCTRK", //! Table with Same Event Track Selections information
166+
DECLARE_SOA_TABLE(HfcRedAssTracks, "AOD", "HFCREDASSTRACK", //! Table with Same Event Track Selections information
164167
aod::hf_correl_charm_had_reduced::NTpcCrossedRowsAssoc,
165168
aod::hf_correl_charm_had_reduced::ItsClsMapAssoc,
166169
aod::hf_correl_charm_had_reduced::ItsNClsAssoc,
@@ -174,20 +177,73 @@ DECLARE_SOA_TABLE(HfcRedSEBases, "AOD", "HFCREDSEBASE", //! Table with Same Even
174177
aod::hf_correl_charm_had_reduced::DeltaEta,
175178
aod::hf_correl_charm_had_reduced::DeltaPhi);
176179

177-
DECLARE_SOA_TABLE(HfcRedCorrSEs, "AOD", "HFCREDCORRSE", //! Correlation pairs information Same Event
180+
DECLARE_SOA_TABLE(HfcRedSEChHads, "AOD", "HFCREDSECHHAD", //! Correlation pairs information Same Event
178181
aod::hf_correl_charm_had_reduced::PoolBin,
179182
aod::hf_correl_charm_had_reduced::PtTrig,
180183
aod::hf_correl_charm_had_reduced::PtAssoc,
181184
aod::hf_correl_charm_had_reduced::DeltaEta,
182-
aod::hf_correl_charm_had_reduced::DeltaPhi);
185+
aod::hf_correl_charm_had_reduced::DeltaPhi,
186+
aod::hf_correl_charm_had_reduced::InvMassTrig,
187+
aod::hf_correl_charm_had_reduced::BdtScore0Trig,
188+
aod::hf_correl_charm_had_reduced::BdtScore1Trig,
189+
aod::hf_correl_charm_had_reduced::NTpcCrossedRowsAssoc,
190+
aod::hf_correl_charm_had_reduced::ItsClsMapAssoc,
191+
aod::hf_correl_charm_had_reduced::ItsNClsAssoc,
192+
aod::hf_correl_charm_had_reduced::DcaXYAssoc,
193+
aod::hf_correl_charm_had_reduced::DcaZAssoc,
194+
soa::Marker<1>);
183195

184-
DECLARE_SOA_TABLE(HfcRedCorrMEs, "AOD", "HFCREDCORRME", //! Correlation pairs information Mixed Event
196+
DECLARE_SOA_TABLE(HfcRedMEChHads, "AOD", "HFCREDMECHHAD", //! Correlation pairs information Same Event
185197
aod::hf_correl_charm_had_reduced::PoolBin,
186198
aod::hf_correl_charm_had_reduced::PtTrig,
187199
aod::hf_correl_charm_had_reduced::PtAssoc,
188200
aod::hf_correl_charm_had_reduced::DeltaEta,
189-
aod::hf_correl_charm_had_reduced::DeltaPhi);
201+
aod::hf_correl_charm_had_reduced::DeltaPhi,
202+
aod::hf_correl_charm_had_reduced::InvMassTrig,
203+
aod::hf_correl_charm_had_reduced::BdtScore0Trig,
204+
aod::hf_correl_charm_had_reduced::BdtScore1Trig,
205+
aod::hf_correl_charm_had_reduced::NTpcCrossedRowsAssoc,
206+
aod::hf_correl_charm_had_reduced::ItsClsMapAssoc,
207+
aod::hf_correl_charm_had_reduced::ItsNClsAssoc,
208+
aod::hf_correl_charm_had_reduced::DcaXYAssoc,
209+
aod::hf_correl_charm_had_reduced::DcaZAssoc,
210+
soa::Marker<2>);
190211

212+
DECLARE_SOA_TABLE(HfcRedSEHadHads, "AOD", "HFCREDSEHADHAD", //! Correlation pairs information Same Event
213+
aod::hf_correl_charm_had_reduced::PoolBin,
214+
aod::hf_correl_charm_had_reduced::PtTrig,
215+
aod::hf_correl_charm_had_reduced::PtAssoc,
216+
aod::hf_correl_charm_had_reduced::DeltaEta,
217+
aod::hf_correl_charm_had_reduced::DeltaPhi,
218+
aod::hf_correl_charm_had_reduced::NTpcCrossedRowsTrig,
219+
aod::hf_correl_charm_had_reduced::ItsClsMapTrig,
220+
aod::hf_correl_charm_had_reduced::ItsNClsTrig,
221+
aod::hf_correl_charm_had_reduced::DcaXYTrig,
222+
aod::hf_correl_charm_had_reduced::DcaZTrig,
223+
aod::hf_correl_charm_had_reduced::NTpcCrossedRowsAssoc,
224+
aod::hf_correl_charm_had_reduced::ItsClsMapAssoc,
225+
aod::hf_correl_charm_had_reduced::ItsNClsAssoc,
226+
aod::hf_correl_charm_had_reduced::DcaXYAssoc,
227+
aod::hf_correl_charm_had_reduced::DcaZAssoc,
228+
soa::Marker<1>);
229+
230+
DECLARE_SOA_TABLE(HfcRedMEHadHads, "AOD", "HFCREDMEHADHAD", //! Correlation pairs information Same Event
231+
aod::hf_correl_charm_had_reduced::PoolBin,
232+
aod::hf_correl_charm_had_reduced::PtTrig,
233+
aod::hf_correl_charm_had_reduced::PtAssoc,
234+
aod::hf_correl_charm_had_reduced::DeltaEta,
235+
aod::hf_correl_charm_had_reduced::DeltaPhi,
236+
aod::hf_correl_charm_had_reduced::NTpcCrossedRowsTrig,
237+
aod::hf_correl_charm_had_reduced::ItsClsMapTrig,
238+
aod::hf_correl_charm_had_reduced::ItsNClsTrig,
239+
aod::hf_correl_charm_had_reduced::DcaXYTrig,
240+
aod::hf_correl_charm_had_reduced::DcaZTrig,
241+
aod::hf_correl_charm_had_reduced::NTpcCrossedRowsAssoc,
242+
aod::hf_correl_charm_had_reduced::ItsClsMapAssoc,
243+
aod::hf_correl_charm_had_reduced::ItsNClsAssoc,
244+
aod::hf_correl_charm_had_reduced::DcaXYAssoc,
245+
aod::hf_correl_charm_had_reduced::DcaZAssoc,
246+
soa::Marker<2>);
191247
} // namespace o2::aod
192248

193249
#endif // PWGHF_HFC_DATAMODEL_DERIVEDDATACORRELATIONTABLES_H_

0 commit comments

Comments
 (0)