Skip to content

Commit 044d08f

Browse files
Marcellocostialibuild
Marcellocosti
and
alibuild
authored
[PWGHF] Refactor data creator for HF correlations (#12989)
Co-authored-by: ALICE Action Bot <alibuild@cern.ch>
1 parent 9ee6f49 commit 044d08f

File tree

3 files changed

+824
-493
lines changed

3 files changed

+824
-493
lines changed

‎PWGHF/HFC/DataModel/DerivedDataCorrelationTables.h‎

Lines changed: 146 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ DECLARE_SOA_TABLE(HfcRedCollisions, "AOD", "HFCREDCOLLISION", //! Table with col
3535
aod::hf_collisions_reduced::NumPvContrib,
3636
aod::hf_collisions_reduced::PosZ);
3737

38-
DECLARE_SOA_TABLE(HfcRedFlowColls, "AOD", "HFCREDFLOWCOLL", //! Table with collision info
38+
DECLARE_SOA_TABLE(HfcRedCorrColls, "AOD", "HFCREDCORRCOLL", //! Table with collision info
3939
soa::Index<>,
4040
aod::hf_collisions_reduced::Multiplicity,
4141
aod::hf_collisions_reduced::NumPvContrib,
@@ -44,25 +44,18 @@ DECLARE_SOA_TABLE(HfcRedFlowColls, "AOD", "HFCREDFLOWCOLL", //! Table with colli
4444

4545
using HfcRedCollision = HfcRedCollisions::iterator;
4646

47-
// DECLARE_SOA_TABLE(HfCandColCounts, "AOD", "HFCANDCOLCOUNT", //! Table with number of collisions which contain at least one candidate
48-
// aod::hf_collisions_reduced::OriginalCollisionCount);
49-
5047
namespace hf_candidate_reduced
5148
{
5249
DECLARE_SOA_INDEX_COLUMN(HfcRedCollision, hfcRedCollision); //! ReducedCollision index
53-
DECLARE_SOA_INDEX_COLUMN(HfcRedFlowColl, hfcRedFlowColl); //! ReducedCollision index
5450
DECLARE_SOA_COLUMN(Prong0Id, prong0Id, int); //! Prong 0 index
5551
DECLARE_SOA_COLUMN(Prong1Id, prong1Id, int); //! Prong 1 index
5652
DECLARE_SOA_COLUMN(Prong2Id, prong2Id, int); //! Prong2 index
5753
DECLARE_SOA_COLUMN(PhiCand, phiCand, float); //! Phi of the candidate
5854
DECLARE_SOA_COLUMN(EtaCand, etaCand, float); //! Eta of the candidate
5955
DECLARE_SOA_COLUMN(PtCand, ptCand, float); //! Pt of the candidate
6056
DECLARE_SOA_COLUMN(InvMassDs, invMassDs, float); //! Invariant mass of Ds candidate
61-
DECLARE_SOA_COLUMN(InvMassCand, invMassCand, float); //! Invariant mass of Charm candidate
6257
DECLARE_SOA_COLUMN(BdtScorePrompt, bdtScorePrompt, float); //! BDT output score for prompt hypothesis
6358
DECLARE_SOA_COLUMN(BdtScoreBkg, bdtScoreBkg, float); //! BDT output score for background hypothesis
64-
DECLARE_SOA_COLUMN(BdtScore0, bdtScore0, float); //! First BDT output score
65-
DECLARE_SOA_COLUMN(BdtScore1, bdtScore1, float); //! Second BDT output score
6659
} // namespace hf_candidate_reduced
6760
DECLARE_SOA_TABLE(DsCandReduceds, "AOD", "DSCANDREDUCED", //! Table with Ds candidate info
6861
soa::Index<>,
@@ -81,23 +74,6 @@ DECLARE_SOA_TABLE(DsCandSelInfos, "AOD", "DSCANDSELINFO", //! Table with Ds cand
8174
aod::hf_candidate_reduced::BdtScorePrompt,
8275
aod::hf_candidate_reduced::BdtScoreBkg);
8376

84-
DECLARE_SOA_TABLE(HfcRedCharmTrigs, "AOD", "HFCREDCHARMTRIG", //! Table with charm hadron candidate info
85-
soa::Index<>,
86-
aod::hf_candidate_reduced::HfcRedFlowCollId,
87-
aod::hf_candidate_reduced::PhiCand,
88-
aod::hf_candidate_reduced::EtaCand,
89-
aod::hf_candidate_reduced::PtCand,
90-
aod::hf_candidate_reduced::InvMassCand,
91-
aod::hf_candidate_reduced::Prong0Id,
92-
aod::hf_candidate_reduced::Prong1Id,
93-
aod::hf_candidate_reduced::Prong2Id);
94-
95-
DECLARE_SOA_TABLE(HfcRedCharmMls, "AOD", "HFCREDCHARMML", //! Table with charm hadron candidate selection info
96-
soa::Index<>,
97-
aod::hf_candidate_reduced::HfcRedFlowCollId,
98-
aod::hf_candidate_reduced::BdtScore0,
99-
aod::hf_candidate_reduced::BdtScore1);
100-
10177
namespace hf_assoc_track_reduced
10278
{
10379
DECLARE_SOA_COLUMN(OriginTrackId, originTrackId, int); //! Original track index
@@ -125,50 +101,154 @@ DECLARE_SOA_TABLE(AssocTrackSels, "AOD", "ASSOCTRACKSEL", //! Table with associa
125101
aod::hf_assoc_track_reduced::ItsClusterMap,
126102
aod::hf_assoc_track_reduced::ItsNCls,
127103
aod::hf_assoc_track_reduced::DcaXY,
128-
aod::hf_assoc_track_reduced::DcaZ)
129-
130-
DECLARE_SOA_TABLE(HfcRedTrkAssocs, "AOD", "HFCREDTRKASSOC", //! Table with associated track info
131-
soa::Index<>,
132-
aod::hf_candidate_reduced::HfcRedFlowCollId,
133-
aod::hf_assoc_track_reduced::OriginTrackId,
134-
aod::hf_assoc_track_reduced::PhiAssocTrack,
135-
aod::hf_assoc_track_reduced::EtaAssocTrack,
136-
aod::hf_assoc_track_reduced::PtAssocTrack);
137-
138-
DECLARE_SOA_TABLE(HfcRedTrkSels, "AOD", "HFCREDTRKSEL", //! Table with associated track info
139-
soa::Index<>,
140-
aod::hf_candidate_reduced::HfcRedFlowCollId,
141-
aod::hf_assoc_track_reduced::NTpcCrossedRows,
142-
aod::hf_assoc_track_reduced::ItsClusterMap,
143-
aod::hf_assoc_track_reduced::ItsNCls,
144-
aod::hf_assoc_track_reduced::DcaXY,
145-
aod::hf_assoc_track_reduced::DcaZ)
104+
aod::hf_assoc_track_reduced::DcaZ);
146105

147106
// definition of columns and tables for Charm-Hadron and Hadron-Hadron correlation pairs
148-
namespace hf_correlation_charm_hadron_reduced
107+
namespace hf_correl_charm_had_reduced
149108
{
150-
DECLARE_SOA_INDEX_COLUMN_FULL(CharmTrig, charmTrig, int, HfcRedCharmTrigs, "_0"); //! Reduced charm trigger candidate index
151-
DECLARE_SOA_INDEX_COLUMN_FULL(HadTrig, hadTrig, int, HfcRedTrkAssocs, "_1"); //! Reduced hadron trigger candidate index
152-
DECLARE_SOA_INDEX_COLUMN_FULL(TrkAssoc, trkAssoc, int, HfcRedTrkAssocs, "_2"); //! Reduced associated track index
153-
DECLARE_SOA_COLUMN(DeltaPhi, deltaPhi, float); //! DeltaPhi between charm hadron and Hadrons
154-
DECLARE_SOA_COLUMN(DeltaEta, deltaEta, float); //! DeltaEta between charm hadron and Hadrons
155-
DECLARE_SOA_COLUMN(PoolBin, poolBin, int); //! Pool Bin for the MixedEvent
156-
} // namespace hf_correlation_charm_hadron_reduced
157-
158-
DECLARE_SOA_TABLE(HfcRedChHads, "AOD", "HFCREDCHHAD", //! Charm-Hadron pairs information
159-
aod::hf_correlation_charm_hadron_reduced::CharmTrigId,
160-
aod::hf_correlation_charm_hadron_reduced::TrkAssocId,
161-
aod::hf_correlation_charm_hadron_reduced::DeltaEta,
162-
aod::hf_correlation_charm_hadron_reduced::DeltaPhi,
163-
aod::hf_correlation_charm_hadron_reduced::PoolBin);
164-
165-
DECLARE_SOA_TABLE(HfcRedHadHads, "AOD", "HFCREDHADHAD", //! Hadron-Hadron pairs information
166-
aod::hf_correlation_charm_hadron_reduced::HadTrigId,
167-
aod::hf_correlation_charm_hadron_reduced::TrkAssocId,
168-
aod::hf_correlation_charm_hadron_reduced::DeltaEta,
169-
aod::hf_correlation_charm_hadron_reduced::DeltaPhi,
170-
aod::hf_correlation_charm_hadron_reduced::PoolBin);
171-
109+
// Correlation columns
110+
DECLARE_SOA_INDEX_COLUMN(HfcRedCorrColl, hfcRedCorrColl); //! ReducedCollision index
111+
DECLARE_SOA_COLUMN(DeltaPhi, deltaPhi, float); //! DeltaPhi between charm hadron and Hadrons
112+
DECLARE_SOA_COLUMN(DeltaEta, deltaEta, float); //! DeltaEta between charm hadron and Hadrons
113+
DECLARE_SOA_COLUMN(PoolBin, poolBin, int); //! Pool Bin for the MixedEvent
114+
// General trigger particle columns
115+
DECLARE_SOA_COLUMN(PhiTrig, phiTrig, float); //! Phi of the trigger candidate
116+
DECLARE_SOA_COLUMN(EtaTrig, etaTrig, float); //! Eta of the trigger candidate
117+
DECLARE_SOA_COLUMN(PtTrig, ptTrig, float); //! Pt of the trigger candidate
118+
// Charm trigger particle selection columns
119+
DECLARE_SOA_COLUMN(InvMassTrig, invMassTrig, float); //! Invariant mass of Charm trigger candidate
120+
DECLARE_SOA_COLUMN(BdtScore0Trig, bdtScore0Trig, float); //! First BDT output score
121+
DECLARE_SOA_COLUMN(BdtScore1Trig, bdtScore1Trig, float); //! Second BDT output score
122+
// Hadron trigger particle selection columns
123+
DECLARE_SOA_COLUMN(NTpcCrossedRowsTrig, nTpcCrossedRowsTrig, int); //! Number of crossed TPC Rows
124+
DECLARE_SOA_COLUMN(ItsClsMapTrig, itsClsMapTrig, int); //! ITS cluster map, one bit per a layer, starting from the innermost
125+
DECLARE_SOA_COLUMN(ItsNClsTrig, itsNClsTrig, int); //! Number of ITS clusters
126+
DECLARE_SOA_COLUMN(DcaXYTrig, dcaXYTrig, float); //! Impact parameter in XY of the track to the primary vertex
127+
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
133+
DECLARE_SOA_COLUMN(NTpcCrossedRowsAssoc, nTpcCrossedRowsAssoc, int); //! Number of crossed TPC Rows
134+
DECLARE_SOA_COLUMN(ItsClsMapAssoc, itsClsMapAssoc, int); //! ITS cluster map, one bit per a layer, starting from the innermost
135+
DECLARE_SOA_COLUMN(ItsNClsAssoc, itsNClsAssoc, int); //! Number of ITS clusters
136+
DECLARE_SOA_COLUMN(DcaXYAssoc, dcaXYAssoc, float); //! Impact parameter in XY of the track to the primary vertex
137+
DECLARE_SOA_COLUMN(DcaZAssoc, dcaZAssoc, float); //! Impact parameter in Z of the track to the primary vertex
138+
} // namespace hf_correl_charm_had_reduced
139+
140+
DECLARE_SOA_TABLE(HfcRedTrigBases, "AOD", "HFCREDTRIGBASE", //! Table with trigger candidate base info
141+
soa::Index<>,
142+
aod::hf_correl_charm_had_reduced::HfcRedCorrCollId,
143+
aod::hf_correl_charm_had_reduced::PhiTrig,
144+
aod::hf_correl_charm_had_reduced::EtaTrig,
145+
aod::hf_correl_charm_had_reduced::PtTrig);
146+
147+
DECLARE_SOA_TABLE(HfcRedTrigCharms, "AOD", "HFCREDTRIGCHARM", //! Table with Same Event Charm-Hadron pairs information
148+
aod::hf_correl_charm_had_reduced::InvMassTrig,
149+
aod::hf_correl_charm_had_reduced::BdtScore0Trig,
150+
aod::hf_correl_charm_had_reduced::BdtScore1Trig);
151+
152+
DECLARE_SOA_TABLE(HfcRedTrigTracks, "AOD", "HFCREDTRIGTRACK", //! Table with Same Event Charm-Hadron pairs information
153+
aod::hf_correl_charm_had_reduced::NTpcCrossedRowsTrig,
154+
aod::hf_correl_charm_had_reduced::ItsClsMapTrig,
155+
aod::hf_correl_charm_had_reduced::ItsNClsTrig,
156+
aod::hf_correl_charm_had_reduced::DcaXYTrig,
157+
aod::hf_correl_charm_had_reduced::DcaZTrig);
158+
159+
DECLARE_SOA_TABLE(HfcRedAssBases, "AOD", "HFCREDASSBASE", //! Table with associated candidate base info
160+
soa::Index<>,
161+
aod::hf_correl_charm_had_reduced::HfcRedCorrCollId,
162+
aod::hf_correl_charm_had_reduced::PhiAssoc,
163+
aod::hf_correl_charm_had_reduced::EtaAssoc,
164+
aod::hf_correl_charm_had_reduced::PtAssoc);
165+
166+
DECLARE_SOA_TABLE(HfcRedAssTracks, "AOD", "HFCREDASSTRACK", //! Table with Same Event Track Selections information
167+
aod::hf_correl_charm_had_reduced::NTpcCrossedRowsAssoc,
168+
aod::hf_correl_charm_had_reduced::ItsClsMapAssoc,
169+
aod::hf_correl_charm_had_reduced::ItsNClsAssoc,
170+
aod::hf_correl_charm_had_reduced::DcaXYAssoc,
171+
aod::hf_correl_charm_had_reduced::DcaZAssoc);
172+
173+
DECLARE_SOA_TABLE(HfcRedSEBases, "AOD", "HFCREDSEBASE", //! Table with Same Event Trig-Assoc pairs
174+
aod::hf_correl_charm_had_reduced::HfcRedCorrCollId,
175+
aod::hf_correl_charm_had_reduced::PtTrig,
176+
aod::hf_correl_charm_had_reduced::PtAssoc,
177+
aod::hf_correl_charm_had_reduced::DeltaEta,
178+
aod::hf_correl_charm_had_reduced::DeltaPhi);
179+
180+
DECLARE_SOA_TABLE(HfcRedSEChHads, "AOD", "HFCREDSECHHAD", //! Correlation pairs information Same Event
181+
aod::hf_correl_charm_had_reduced::PoolBin,
182+
aod::hf_correl_charm_had_reduced::PtTrig,
183+
aod::hf_correl_charm_had_reduced::PtAssoc,
184+
aod::hf_correl_charm_had_reduced::DeltaEta,
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>);
195+
196+
DECLARE_SOA_TABLE(HfcRedMEChHads, "AOD", "HFCREDMECHHAD", //! Correlation pairs information Same Event
197+
aod::hf_correl_charm_had_reduced::PoolBin,
198+
aod::hf_correl_charm_had_reduced::PtTrig,
199+
aod::hf_correl_charm_had_reduced::PtAssoc,
200+
aod::hf_correl_charm_had_reduced::DeltaEta,
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>);
211+
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>);
247+
248+
DECLARE_SOA_TABLE(HfcRedCollInfos, "AOD", "HFCREDCOLLINFO", //! Table with collision info
249+
aod::hf_collisions_reduced::Multiplicity,
250+
aod::hf_collisions_reduced::NumPvContrib,
251+
aod::hf_collisions_reduced::Centrality);
172252
} // namespace o2::aod
173253

174254
#endif // PWGHF_HFC_DATAMODEL_DERIVEDDATACORRELATIONTABLES_H_

0 commit comments

Comments
 (0)