Skip to content

Commit 326cd71

Browse files
MarcellocostiMarcellocosti
committed
Reshape datamodel
1 parent 7c902df commit 326cd71

File tree

3 files changed

+181
-138
lines changed

3 files changed

+181
-138
lines changed

‎PWGHF/HFC/DataModel/DerivedDataCorrelationTables.h‎

Lines changed: 82 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ DECLARE_SOA_TABLE(HfcRedCorrColls, "AOD", "HFCREDCORRCOLL", //! Table with colli
4343
aod::hf_collisions_reduced::PosZ);
4444

4545
using HfcRedCollision = HfcRedCollisions::iterator;
46-
using HfcRedCorrColl = HfcRedCorrColls::iterator;
4746

4847
namespace hf_candidate_reduced
4948
{
@@ -75,44 +74,6 @@ DECLARE_SOA_TABLE(DsCandSelInfos, "AOD", "DSCANDSELINFO", //! Table with Ds cand
7574
aod::hf_candidate_reduced::BdtScorePrompt,
7675
aod::hf_candidate_reduced::BdtScoreBkg);
7776

78-
namespace hf_correlation_trigger_reduced
79-
{
80-
DECLARE_SOA_INDEX_COLUMN(HfcRedCorrColl, hfcRedCorrColl); //! ReducedCollision index
81-
DECLARE_SOA_COLUMN(PhiTrig, phiTrig, float); //! Phi of the trigger candidate
82-
DECLARE_SOA_COLUMN(EtaTrig, etaTrig, float); //! Eta of the trigger candidate
83-
DECLARE_SOA_COLUMN(PtTrig, ptTrig, float); //! Pt of the trigger candidate
84-
DECLARE_SOA_COLUMN(InvMassTrig, invMassTrig, float); //! Invariant mass of Charm trigger candidate
85-
DECLARE_SOA_COLUMN(BdtScore0Trig, bdtScore0Trig, float); //! First BDT output score
86-
DECLARE_SOA_COLUMN(BdtScore1Trig, bdtScore1Trig, float); //! Second BDT output score
87-
DECLARE_SOA_COLUMN(NTpcCrossedRowsTrig, nTpcCrossedRowsTrig, int); //! Number of crossed TPC Rows
88-
DECLARE_SOA_COLUMN(ItsClusterMapTrig, itsClusterMapTrig, int); //! ITS cluster map, one bit per a layer, starting from the innermost
89-
DECLARE_SOA_COLUMN(ItsNClsTrig, itsNClsTrig, int); //! Number of ITS clusters
90-
DECLARE_SOA_COLUMN(EtaTrigTrack, etaTrigTrack, float); //! Eta of the track
91-
DECLARE_SOA_COLUMN(PhiTrigTrack, phiTrigTrack, float); //! Phi of the track
92-
DECLARE_SOA_COLUMN(PtTrigTrack, ptTrigTrack, float); //! Pt of the track
93-
DECLARE_SOA_COLUMN(DcaXYTrig, dcaXYTrig, float); //! Impact parameter in XY of the track to the primary vertex
94-
DECLARE_SOA_COLUMN(DcaZTrig, dcaZTrig, float); //! Impact parameter in Z of the track to the primary vertex
95-
} // namespace hf_correlation_trigger_reduced
96-
97-
DECLARE_SOA_TABLE(HfcRedTrigs, "AOD", "HFCREDTRIG", //! Table with charm hadron candidate info
98-
soa::Index<>,
99-
aod::hf_correlation_trigger_reduced::HfcRedCorrCollId,
100-
aod::hf_correlation_trigger_reduced::PhiTrig,
101-
aod::hf_correlation_trigger_reduced::EtaTrig,
102-
aod::hf_correlation_trigger_reduced::PtTrig);
103-
104-
DECLARE_SOA_TABLE(HfcRedTrigCharms, "AOD", "HFCREDTRIGCHARM", //! Table with Same Event Charm-Hadron pairs information
105-
aod::hf_correlation_trigger_reduced::InvMassTrig,
106-
aod::hf_correlation_trigger_reduced::BdtScore0Trig,
107-
aod::hf_correlation_trigger_reduced::BdtScore1Trig);
108-
109-
DECLARE_SOA_TABLE(HfcRedTrigHads, "AOD", "HFCREDTRIGHAD", //! Table with Same Event Charm-Hadron pairs information
110-
aod::hf_correlation_trigger_reduced::NTpcCrossedRowsTrig,
111-
aod::hf_correlation_trigger_reduced::ItsClusterMapTrig,
112-
aod::hf_correlation_trigger_reduced::ItsNClsTrig,
113-
aod::hf_correlation_trigger_reduced::DcaXYTrig,
114-
aod::hf_correlation_trigger_reduced::DcaZTrig);
115-
11677
namespace hf_assoc_track_reduced
11778
{
11879
DECLARE_SOA_COLUMN(OriginTrackId, originTrackId, int); //! Original track index
@@ -142,41 +103,90 @@ DECLARE_SOA_TABLE(AssocTrackSels, "AOD", "ASSOCTRACKSEL", //! Table with associa
142103
aod::hf_assoc_track_reduced::DcaXY,
143104
aod::hf_assoc_track_reduced::DcaZ);
144105

145-
DECLARE_SOA_TABLE(HfcRedTrkAssocs, "AOD", "HFCREDTRKASSOC", //! Table with associated track info
146-
soa::Index<>,
147-
aod::hf_correlation_trigger_reduced::HfcRedCorrCollId,
148-
aod::hf_assoc_track_reduced::PhiAssocTrack,
149-
aod::hf_assoc_track_reduced::EtaAssocTrack,
150-
aod::hf_assoc_track_reduced::PtAssocTrack);
151-
152-
DECLARE_SOA_TABLE(HfcRedTrkSels, "AOD", "HFCREDSETRKSEL", //! Table with Same Event Track Selections information
153-
aod::hf_assoc_track_reduced::NTpcCrossedRows,
154-
aod::hf_assoc_track_reduced::ItsClusterMap,
155-
aod::hf_assoc_track_reduced::ItsNCls,
156-
aod::hf_assoc_track_reduced::DcaXY,
157-
aod::hf_assoc_track_reduced::DcaZ);
158-
159106
// definition of columns and tables for Charm-Hadron and Hadron-Hadron correlation pairs
160-
namespace hf_correlation_charm_hadron_reduced
107+
namespace hf_correl_charm_had_reduced
161108
{
162-
DECLARE_SOA_COLUMN(DeltaPhi, deltaPhi, float); //! DeltaPhi between charm hadron and Hadrons
163-
DECLARE_SOA_COLUMN(DeltaEta, deltaEta, float); //! DeltaEta between charm hadron and Hadrons
164-
DECLARE_SOA_COLUMN(PoolBin, poolBin, int); //! Pool Bin for the MixedEvent
165-
} // namespace hf_correlation_charm_hadron_reduced
166-
167-
DECLARE_SOA_TABLE(HfcRedSEPairs, "AOD", "HFCREDSEPAIR", //! Table with Same Event Trig-Assoc pairs
168-
aod::hf_correlation_trigger_reduced::HfcRedCorrCollId,
169-
aod::hf_correlation_trigger_reduced::PtTrig,
170-
aod::hf_assoc_track_reduced::PtAssocTrack,
171-
aod::hf_correlation_charm_hadron_reduced::DeltaEta,
172-
aod::hf_correlation_charm_hadron_reduced::DeltaPhi);
173-
174-
DECLARE_SOA_TABLE(HfcRedCorrPair, "AOD", "HFCREDCORRPAIR", //! Correlation pairs information
175-
aod::hf_correlation_charm_hadron_reduced::PoolBin,
176-
aod::hf_correlation_trigger_reduced::PtTrig,
177-
aod::hf_assoc_track_reduced::PtAssocTrack,
178-
aod::hf_correlation_charm_hadron_reduced::DeltaEta,
179-
aod::hf_correlation_charm_hadron_reduced::DeltaPhi);
109+
DECLARE_SOA_INDEX_COLUMN(HfcRedCorrColl, hfcRedCorrColl); //! ReducedCollision index
110+
DECLARE_SOA_COLUMN(DeltaPhi, deltaPhi, float); //! DeltaPhi between charm hadron and Hadrons
111+
DECLARE_SOA_COLUMN(DeltaEta, deltaEta, float); //! DeltaEta between charm hadron and Hadrons
112+
DECLARE_SOA_COLUMN(PoolBin, poolBin, int); //! Pool Bin for the MixedEvent
113+
DECLARE_SOA_COLUMN(PhiTrig, phiTrig, float); //! Phi of the trigger candidate
114+
DECLARE_SOA_COLUMN(EtaTrig, etaTrig, float); //! Eta of the trigger candidate
115+
DECLARE_SOA_COLUMN(PtTrig, ptTrig, float); //! Pt of the trigger candidate
116+
DECLARE_SOA_COLUMN(InvMassTrig, invMassTrig, float); //! Invariant mass of Charm trigger candidate
117+
DECLARE_SOA_COLUMN(BdtScore0Trig, bdtScore0Trig, float); //! First BDT output score
118+
DECLARE_SOA_COLUMN(BdtScore1Trig, bdtScore1Trig, float); //! Second BDT output score
119+
DECLARE_SOA_COLUMN(NTpcCrossedRowsTrig, nTpcCrossedRowsTrig, int); //! Number of crossed TPC Rows
120+
DECLARE_SOA_COLUMN(ItsClsMapTrig, itsClsMapTrig, int); //! ITS cluster map, one bit per a layer, starting from the innermost
121+
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
125+
DECLARE_SOA_COLUMN(DcaXYTrig, dcaXYTrig, float); //! Impact parameter in XY of the track to the primary vertex
126+
DECLARE_SOA_COLUMN(DcaZTrig, dcaZTrig, float); //! Impact parameter in Z of the track to the primary vertex
127+
DECLARE_SOA_COLUMN(NTpcCrossedRowsAssoc, nTpcCrossedRowsAssoc, int); //! Number of crossed TPC Rows
128+
DECLARE_SOA_COLUMN(ItsClsMapAssoc, itsClsMapAssoc, int); //! ITS cluster map, one bit per a layer, starting from the innermost
129+
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
133+
DECLARE_SOA_COLUMN(DcaXYAssoc, dcaXYAssoc, float); //! Impact parameter in XY of the track to the primary vertex
134+
DECLARE_SOA_COLUMN(DcaZAssoc, dcaZAssoc, float); //! Impact parameter in Z of the track to the primary vertex
135+
} // namespace hf_correl_charm_had_reduced
136+
137+
DECLARE_SOA_TABLE(HfcRedTrigBases, "AOD", "HFCREDTRIGBASE", //! Table with trigger candidate base info
138+
soa::Index<>,
139+
aod::hf_correl_charm_had_reduced::HfcRedCorrCollId,
140+
aod::hf_correl_charm_had_reduced::PhiTrig,
141+
aod::hf_correl_charm_had_reduced::EtaTrig,
142+
aod::hf_correl_charm_had_reduced::PtTrig);
143+
144+
DECLARE_SOA_TABLE(HfcRedTrigCharms, "AOD", "HFCREDTRIGCHARM", //! Table with Same Event Charm-Hadron pairs information
145+
aod::hf_correl_charm_had_reduced::InvMassTrig,
146+
aod::hf_correl_charm_had_reduced::BdtScore0Trig,
147+
aod::hf_correl_charm_had_reduced::BdtScore1Trig);
148+
149+
DECLARE_SOA_TABLE(HfcRedTrigTrks, "AOD", "HFCREDTRIGTRK", //! Table with Same Event Charm-Hadron pairs information
150+
aod::hf_correl_charm_had_reduced::NTpcCrossedRowsTrig,
151+
aod::hf_correl_charm_had_reduced::ItsClsMapTrig,
152+
aod::hf_correl_charm_had_reduced::ItsNClsTrig,
153+
aod::hf_correl_charm_had_reduced::DcaXYTrig,
154+
aod::hf_correl_charm_had_reduced::DcaZTrig);
155+
156+
DECLARE_SOA_TABLE(HfcRedAssocBases, "AOD", "HFCREDASSOCBASE", //! Table with associated candidate base info
157+
soa::Index<>,
158+
aod::hf_correl_charm_had_reduced::HfcRedCorrCollId,
159+
aod::hf_correl_charm_had_reduced::PhiAssoc,
160+
aod::hf_correl_charm_had_reduced::EtaAssoc,
161+
aod::hf_correl_charm_had_reduced::PtAssoc);
162+
163+
DECLARE_SOA_TABLE(HfcRedAssocTrks, "AOD", "HFCREDASSOCTRK", //! Table with Same Event Track Selections information
164+
aod::hf_correl_charm_had_reduced::NTpcCrossedRowsAssoc,
165+
aod::hf_correl_charm_had_reduced::ItsClsMapAssoc,
166+
aod::hf_correl_charm_had_reduced::ItsNClsAssoc,
167+
aod::hf_correl_charm_had_reduced::DcaXYAssoc,
168+
aod::hf_correl_charm_had_reduced::DcaZAssoc);
169+
170+
DECLARE_SOA_TABLE(HfcRedSEBases, "AOD", "HFCREDSEBASE", //! Table with Same Event Trig-Assoc pairs
171+
aod::hf_correl_charm_had_reduced::HfcRedCorrCollId,
172+
aod::hf_correl_charm_had_reduced::PtTrig,
173+
aod::hf_correl_charm_had_reduced::PtAssoc,
174+
aod::hf_correl_charm_had_reduced::DeltaEta,
175+
aod::hf_correl_charm_had_reduced::DeltaPhi);
176+
177+
DECLARE_SOA_TABLE(HfcRedCorrSEs, "AOD", "HFCREDCORRSE", //! Correlation pairs information Same Event
178+
aod::hf_correl_charm_had_reduced::PoolBin,
179+
aod::hf_correl_charm_had_reduced::PtTrig,
180+
aod::hf_correl_charm_had_reduced::PtAssoc,
181+
aod::hf_correl_charm_had_reduced::DeltaEta,
182+
aod::hf_correl_charm_had_reduced::DeltaPhi);
183+
184+
DECLARE_SOA_TABLE(HfcRedCorrMEs, "AOD", "HFCREDCORRME", //! Correlation pairs information Mixed Event
185+
aod::hf_correl_charm_had_reduced::PoolBin,
186+
aod::hf_correl_charm_had_reduced::PtTrig,
187+
aod::hf_correl_charm_had_reduced::PtAssoc,
188+
aod::hf_correl_charm_had_reduced::DeltaEta,
189+
aod::hf_correl_charm_had_reduced::DeltaPhi);
180190

181191
} // namespace o2::aod
182192

0 commit comments

Comments
 (0)