Skip to content

Commit bd9b294

Browse files
MarcellocostiMarcellocosti
committed
Update correlator script and table structure
1 parent 6a918f9 commit bd9b294

File tree

3 files changed

+354
-565
lines changed

3 files changed

+354
-565
lines changed

‎PWGHF/HFC/DataModel/DerivedDataCorrelationTables.h‎

Lines changed: 65 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -35,34 +35,28 @@ 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,
4242
aod::hf_collisions_reduced::Centrality,
4343
aod::hf_collisions_reduced::PosZ);
4444

4545
using HfcRedCollision = HfcRedCollisions::iterator;
46-
47-
// DECLARE_SOA_TABLE(HfCandColCounts, "AOD", "HFCANDCOLCOUNT", //! Table with number of collisions which contain at least one candidate
48-
// aod::hf_collisions_reduced::OriginalCollisionCount);
46+
using HfcRedCorrColl = HfcRedCorrColls::iterator;
4947

5048
namespace hf_candidate_reduced
5149
{
5250
DECLARE_SOA_INDEX_COLUMN(HfcRedCollision, hfcRedCollision); //! ReducedCollision index
53-
DECLARE_SOA_INDEX_COLUMN(HfcRedFlowColl, hfcRedFlowColl); //! ReducedCollision index
5451
DECLARE_SOA_COLUMN(Prong0Id, prong0Id, int); //! Prong 0 index
5552
DECLARE_SOA_COLUMN(Prong1Id, prong1Id, int); //! Prong 1 index
5653
DECLARE_SOA_COLUMN(Prong2Id, prong2Id, int); //! Prong2 index
5754
DECLARE_SOA_COLUMN(PhiCand, phiCand, float); //! Phi of the candidate
5855
DECLARE_SOA_COLUMN(EtaCand, etaCand, float); //! Eta of the candidate
5956
DECLARE_SOA_COLUMN(PtCand, ptCand, float); //! Pt of the candidate
6057
DECLARE_SOA_COLUMN(InvMassDs, invMassDs, float); //! Invariant mass of Ds candidate
61-
DECLARE_SOA_COLUMN(InvMassCand, invMassCand, float); //! Invariant mass of Charm candidate
6258
DECLARE_SOA_COLUMN(BdtScorePrompt, bdtScorePrompt, float); //! BDT output score for prompt hypothesis
6359
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
6660
} // namespace hf_candidate_reduced
6761
DECLARE_SOA_TABLE(DsCandReduceds, "AOD", "DSCANDREDUCED", //! Table with Ds candidate info
6862
soa::Index<>,
@@ -81,35 +75,58 @@ DECLARE_SOA_TABLE(DsCandSelInfos, "AOD", "DSCANDSELINFO", //! Table with Ds cand
8175
aod::hf_candidate_reduced::BdtScorePrompt,
8276
aod::hf_candidate_reduced::BdtScoreBkg);
8377

84-
DECLARE_SOA_TABLE(HfcRedCharmTrigs, "AOD", "HFCREDCHARMTRIG", //! Table with charm hadron candidate info
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
8598
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::BdtScore0,
92-
aod::hf_candidate_reduced::BdtScore1);
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::HfcRedCorrCollId,
106+
aod::hf_correlation_trigger_reduced::InvMassTrig,
107+
aod::hf_correlation_trigger_reduced::BdtScore0Trig,
108+
aod::hf_correlation_trigger_reduced::BdtScore1Trig);
109+
110+
DECLARE_SOA_TABLE(HfcRedTrigHads, "AOD", "HFCREDTRIGHAD", //! Table with Same Event Charm-Hadron pairs information
111+
aod::hf_correlation_trigger_reduced::HfcRedCorrCollId,
112+
aod::hf_correlation_trigger_reduced::NTpcCrossedRowsTrig,
113+
aod::hf_correlation_trigger_reduced::ItsClusterMapTrig,
114+
aod::hf_correlation_trigger_reduced::ItsNClsTrig,
115+
aod::hf_correlation_trigger_reduced::DcaXYTrig,
116+
aod::hf_correlation_trigger_reduced::DcaZTrig);
93117

94118
namespace hf_assoc_track_reduced
95119
{
96-
DECLARE_SOA_COLUMN(OriginTrackId, originTrackId, int); //! Original track index
97-
DECLARE_SOA_COLUMN(NTpcCrossedRows, nTpcCrossedRows, int); //! Number of crossed TPC Rows
98-
DECLARE_SOA_COLUMN(ItsClusterMap, itsClusterMap, int); //! ITS cluster map, one bit per a layer, starting from the innermost
99-
DECLARE_SOA_COLUMN(ItsNCls, itsNCls, int); //! Number of ITS clusters
100-
DECLARE_SOA_COLUMN(EtaAssocTrack, etaAssocTrack, float); //! Eta of the track
101-
DECLARE_SOA_COLUMN(PhiAssocTrack, phiAssocTrack, float); //! Phi of the track
102-
DECLARE_SOA_COLUMN(PtAssocTrack, ptAssocTrack, float); //! Pt of the track
103-
DECLARE_SOA_COLUMN(DcaXY, dcaXY, float); //! Impact parameter in XY of the track to the primary vertex
104-
DECLARE_SOA_COLUMN(DcaZ, dcaZ, float); //! Impact parameter in Z of the track to the primary vertex
105-
DECLARE_SOA_COLUMN(NTpcCrossedRowsTrig, nTpcCrossedRowsTrig, int); //! Number of crossed TPC Rows
106-
DECLARE_SOA_COLUMN(ItsClusterMapTrig, itsClusterMapTrig, int); //! ITS cluster map, one bit per a layer, starting from the innermost
107-
DECLARE_SOA_COLUMN(ItsNClsTrig, itsNClsTrig, int); //! Number of ITS clusters
108-
DECLARE_SOA_COLUMN(EtaAssocTrackTrig, etaAssocTrackTrig, float); //! Eta of the track
109-
DECLARE_SOA_COLUMN(PhiAssocTrackTrig, phiAssocTrackTrig, float); //! Phi of the track
110-
DECLARE_SOA_COLUMN(PtAssocTrackTrig, ptAssocTrackTrig, float); //! Pt of the track
111-
DECLARE_SOA_COLUMN(DcaXYTrig, dcaXYTrig, float); //! Impact parameter in XY of the track to the primary vertex
112-
DECLARE_SOA_COLUMN(DcaZTrig, dcaZTrig, float); //! Impact parameter in Z of the track to the primary vertex
120+
DECLARE_SOA_INDEX_COLUMN(HfcRedCorrColl, hfcRedCorrColl); //! ReducedCollision index
121+
DECLARE_SOA_COLUMN(OriginTrackId, originTrackId, int); //! Original track index
122+
DECLARE_SOA_COLUMN(NTpcCrossedRows, nTpcCrossedRows, int); //! Number of crossed TPC Rows
123+
DECLARE_SOA_COLUMN(ItsClusterMap, itsClusterMap, int); //! ITS cluster map, one bit per a layer, starting from the innermost
124+
DECLARE_SOA_COLUMN(ItsNCls, itsNCls, int); //! Number of ITS clusters
125+
DECLARE_SOA_COLUMN(EtaAssocTrack, etaAssocTrack, float); //! Eta of the track
126+
DECLARE_SOA_COLUMN(PhiAssocTrack, phiAssocTrack, float); //! Phi of the track
127+
DECLARE_SOA_COLUMN(PtAssocTrack, ptAssocTrack, float); //! Pt of the track
128+
DECLARE_SOA_COLUMN(DcaXY, dcaXY, float); //! Impact parameter in XY of the track to the primary vertex
129+
DECLARE_SOA_COLUMN(DcaZ, dcaZ, float); //! Impact parameter in Z of the track to the primary vertex
113130
} // namespace hf_assoc_track_reduced
114131
DECLARE_SOA_TABLE(AssocTrackReds, "AOD", "ASSOCTRACKRED", //! Table with associated track info
115132
soa::Index<>,
@@ -130,72 +147,41 @@ DECLARE_SOA_TABLE(AssocTrackSels, "AOD", "ASSOCTRACKSEL", //! Table with associa
130147

131148
DECLARE_SOA_TABLE(HfcRedTrkAssocs, "AOD", "HFCREDTRKASSOC", //! Table with associated track info
132149
soa::Index<>,
133-
aod::hf_candidate_reduced::HfcRedFlowCollId,
150+
aod::hf_correlation_trigger_reduced::HfcRedCorrCollId,
134151
aod::hf_assoc_track_reduced::PhiAssocTrack,
135152
aod::hf_assoc_track_reduced::EtaAssocTrack,
136-
aod::hf_assoc_track_reduced::PtAssocTrack,
153+
aod::hf_assoc_track_reduced::PtAssocTrack)
154+
155+
DECLARE_SOA_TABLE(HfcRedTrkSels, "AOD", "HFCREDSETRKSEL", //! Table with Same Event Track Selections information
156+
aod::hf_correlation_trigger_reduced::HfcRedCorrCollId,
137157
aod::hf_assoc_track_reduced::NTpcCrossedRows,
138158
aod::hf_assoc_track_reduced::ItsClusterMap,
139159
aod::hf_assoc_track_reduced::ItsNCls,
140160
aod::hf_assoc_track_reduced::DcaXY,
141-
aod::hf_assoc_track_reduced::DcaZ)
161+
aod::hf_assoc_track_reduced::DcaZ);
142162

143163
// definition of columns and tables for Charm-Hadron and Hadron-Hadron correlation pairs
144164
namespace hf_correlation_charm_hadron_reduced
145165
{
146-
DECLARE_SOA_INDEX_COLUMN_FULL(CharmTrig, charmTrig, int, HfcRedCharmTrigs, "_0"); //! Reduced charm trigger candidate index
147-
DECLARE_SOA_INDEX_COLUMN_FULL(HadTrig, hadTrig, int, HfcRedTrkAssocs, "_1"); //! Reduced hadron trigger candidate index
148-
DECLARE_SOA_INDEX_COLUMN_FULL(TrkAssoc, trkAssoc, int, HfcRedTrkAssocs, "_2"); //! Reduced associated track index
166+
DECLARE_SOA_INDEX_COLUMN(HfcRedCorrColl, hfcRedCorrColl); //! ReducedCollision index
149167
DECLARE_SOA_COLUMN(DeltaPhi, deltaPhi, float); //! DeltaPhi between charm hadron and Hadrons
150168
DECLARE_SOA_COLUMN(DeltaEta, deltaEta, float); //! DeltaEta between charm hadron and Hadrons
151169
DECLARE_SOA_COLUMN(PoolBin, poolBin, int); //! Pool Bin for the MixedEvent
152170
} // namespace hf_correlation_charm_hadron_reduced
153171

154-
DECLARE_SOA_TABLE(HfcRedSEChHads, "AOD", "HFCREDSECHHAD", //! Table with Same Event Charm-Hadron pairs information
155-
aod::hf_correlation_charm_hadron_reduced::DeltaEta,
156-
aod::hf_correlation_charm_hadron_reduced::DeltaPhi,
157-
aod::hf_correlation_charm_hadron_reduced::PoolBin,
158-
aod::hf_candidate_reduced::PtCand,
159-
aod::hf_candidate_reduced::InvMassCand,
160-
aod::hf_candidate_reduced::BdtScore0,
161-
aod::hf_candidate_reduced::BdtScore1,
172+
DECLARE_SOA_TABLE(HfcRedSEPairs, "AOD", "HFCREDSEPAIR", //! Table with Same Event Trig-Assoc pairs
173+
aod::hf_correlation_charm_hadron_reduced::HfcRedCorrCollId,
174+
aod::hf_correlation_trigger_reduced::PtTrig,
162175
aod::hf_assoc_track_reduced::PtAssocTrack,
163-
aod::hf_assoc_track_reduced::NTpcCrossedRows,
164-
aod::hf_assoc_track_reduced::ItsClusterMap,
165-
aod::hf_assoc_track_reduced::ItsNCls,
166-
aod::hf_assoc_track_reduced::DcaXY,
167-
aod::hf_assoc_track_reduced::DcaZ);
168-
169-
DECLARE_SOA_TABLE(HfcRedSEHadHads, "AOD", "HFCREDSEHADHAD", //! Table with Same Event Hadron-Hadron pairs information
170176
aod::hf_correlation_charm_hadron_reduced::DeltaEta,
171-
aod::hf_correlation_charm_hadron_reduced::DeltaPhi,
177+
aod::hf_correlation_charm_hadron_reduced::DeltaPhi);
178+
179+
DECLARE_SOA_TABLE(HfcRedCorrPair, "AOD", "HFCREDCORRPAIR", //! Correlation pairs information
172180
aod::hf_correlation_charm_hadron_reduced::PoolBin,
173-
aod::hf_assoc_track_reduced::PtAssocTrackTrig,
174-
aod::hf_assoc_track_reduced::NTpcCrossedRowsTrig,
175-
aod::hf_assoc_track_reduced::ItsClusterMapTrig,
176-
aod::hf_assoc_track_reduced::ItsNClsTrig,
177-
aod::hf_assoc_track_reduced::DcaXYTrig,
178-
aod::hf_assoc_track_reduced::DcaZTrig,
181+
aod::hf_correlation_trigger_reduced::PtTrig,
179182
aod::hf_assoc_track_reduced::PtAssocTrack,
180-
aod::hf_assoc_track_reduced::NTpcCrossedRows,
181-
aod::hf_assoc_track_reduced::ItsClusterMap,
182-
aod::hf_assoc_track_reduced::ItsNCls,
183-
aod::hf_assoc_track_reduced::DcaXY,
184-
aod::hf_assoc_track_reduced::DcaZ);
185-
186-
DECLARE_SOA_TABLE(HfcRedChHads, "AOD", "HFCREDCHHAD", //! Charm-Hadron pairs information
187-
aod::hf_correlation_charm_hadron_reduced::CharmTrigId,
188-
aod::hf_correlation_charm_hadron_reduced::TrkAssocId,
189-
aod::hf_correlation_charm_hadron_reduced::DeltaEta,
190-
aod::hf_correlation_charm_hadron_reduced::DeltaPhi,
191-
aod::hf_correlation_charm_hadron_reduced::PoolBin);
192-
193-
DECLARE_SOA_TABLE(HfcRedHadHads, "AOD", "HFCREDHADHAD", //! Hadron-Hadron pairs information
194-
aod::hf_correlation_charm_hadron_reduced::HadTrigId,
195-
aod::hf_correlation_charm_hadron_reduced::TrkAssocId,
196183
aod::hf_correlation_charm_hadron_reduced::DeltaEta,
197-
aod::hf_correlation_charm_hadron_reduced::DeltaPhi,
198-
aod::hf_correlation_charm_hadron_reduced::PoolBin);
184+
aod::hf_correlation_charm_hadron_reduced::DeltaPhi);
199185

200186
} // namespace o2::aod
201187

0 commit comments

Comments
 (0)