Skip to content

Commit 1ae86a5

Browse files
author
Ida Torkjellsdatter Storehaug
committed
Removed DCA from B meson table in tableReader and dqEffciiency with associations, added B meosn phi
1 parent a3cf0f8 commit 1ae86a5

File tree

2 files changed

+7
-20
lines changed

2 files changed

+7
-20
lines changed

‎PWGDQ/Tasks/dqEfficiency_withAssoc.cxx‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ DECLARE_SOA_COLUMN(massBcandidate, MBcandidate, float);
8484
DECLARE_SOA_COLUMN(MassDileptonCandidate, massDileptonCandidate, float);
8585
DECLARE_SOA_COLUMN(deltaMassBcandidate, deltaMBcandidate, float);
8686
DECLARE_SOA_COLUMN(pTBcandidate, PtBcandidate, float);
87+
DECLARE_SOA_COLUMN(EtaBcandidate, etaBcandidate, float);
88+
DECLARE_SOA_COLUMN(PhiBcandidate, phiBcandidate, float);
8789
DECLARE_SOA_COLUMN(LxyBcandidate, lxyBcandidate, float);
8890
DECLARE_SOA_COLUMN(LxyzBcandidate, lxyzBcandidate, float);
8991
DECLARE_SOA_COLUMN(LzBcandidate, lzBcandidate, float);
@@ -118,12 +120,6 @@ DECLARE_SOA_COLUMN(TPCnsigmaPrleg1, tpcnsigmaPrleg1, float);
118120
DECLARE_SOA_COLUMN(TPCnsigmaElleg2, tpcnsigmaElleg2, float);
119121
DECLARE_SOA_COLUMN(TPCnsigmaPileg2, tpcnsigmaPileg2, float);
120122
DECLARE_SOA_COLUMN(TPCnsigmaPrleg2, tpcnsigmaPrleg2, float);
121-
DECLARE_SOA_COLUMN(DCAXYassoc, dcaXYassoc, float);
122-
DECLARE_SOA_COLUMN(DCAZassoc, dcaZassoc, float);
123-
DECLARE_SOA_COLUMN(DCAXYleg1, dcaXYleg1, float);
124-
DECLARE_SOA_COLUMN(DCAZleg1, dcaZleg1, float);
125-
DECLARE_SOA_COLUMN(DCAXYleg2, dcaXYleg2, float);
126-
DECLARE_SOA_COLUMN(DCAZleg2, dcaZleg2, float);
127123
DECLARE_SOA_COLUMN(ITSClusterMapassoc, itsClusterMapassoc, uint8_t);
128124
DECLARE_SOA_COLUMN(ITSClusterMapleg1, itsClusterMapleg1, uint8_t);
129125
DECLARE_SOA_COLUMN(ITSClusterMapleg2, itsClusterMapleg2, uint8_t);
@@ -173,7 +169,7 @@ DECLARE_SOA_TABLE(MuonAmbiguities, "AOD", "DQMUONAMB", dqanalysisflags::MuonAmbi
173169
DECLARE_SOA_TABLE(Prefilter, "AOD", "DQPREFILTER", dqanalysisflags::IsBarrelSelectedPrefilter); //! joinable to ReducedTracksAssoc
174170
DECLARE_SOA_TABLE(BmesonCandidates, "AOD", "DQBMESONS",
175171
dqanalysisflags::RunNumber, dqanalysisflags::EventIdx, dqanalysisflags::EventTimestamp,
176-
dqanalysisflags::massBcandidate, dqanalysisflags::MassDileptonCandidate, dqanalysisflags::deltaMassBcandidate, dqanalysisflags::pTBcandidate,
172+
dqanalysisflags::massBcandidate, dqanalysisflags::MassDileptonCandidate, dqanalysisflags::deltaMassBcandidate, dqanalysisflags::pTBcandidate, dqanalysisflags::EtaBcandidate, dqanalysisflags::PhiBcandidate,
177173
dqanalysisflags::LxyBcandidate, dqanalysisflags::LxyzBcandidate, dqanalysisflags::LzBcandidate,
178174
dqanalysisflags::TauxyBcandidate, dqanalysisflags::TauzBcandidate, dqanalysisflags::CosPBcandidate, dqanalysisflags::Chi2Bcandidate,
179175
dqanalysisflags::GlobalIndexassoc, dqanalysisflags::GlobalIndexleg1, dqanalysisflags::GlobalIndexleg2,
@@ -182,7 +178,6 @@ DECLARE_SOA_TABLE(BmesonCandidates, "AOD", "DQBMESONS",
182178
dqanalysisflags::TPCnsigmaKaassoc, dqanalysisflags::TPCnsigmaPiassoc, dqanalysisflags::TPCnsigmaPrassoc, dqanalysisflags::TOFnsigmaKaassoc,
183179
dqanalysisflags::TPCnsigmaElleg1, dqanalysisflags::TPCnsigmaPileg1, dqanalysisflags::TPCnsigmaPrleg1,
184180
dqanalysisflags::TPCnsigmaElleg2, dqanalysisflags::TPCnsigmaPileg2, dqanalysisflags::TPCnsigmaPrleg2,
185-
dqanalysisflags::DCAXYassoc, dqanalysisflags::DCAZassoc, dqanalysisflags::DCAXYleg1, dqanalysisflags::DCAZleg1, dqanalysisflags::DCAXYleg2, dqanalysisflags::DCAZleg2,
186181
dqanalysisflags::ITSClusterMapassoc, dqanalysisflags::ITSClusterMapleg1, dqanalysisflags::ITSClusterMapleg2,
187182
dqanalysisflags::ITSChi2assoc, dqanalysisflags::ITSChi2leg1, dqanalysisflags::ITSChi2leg2,
188183
dqanalysisflags::TPCNclsassoc, dqanalysisflags::TPCNclsleg1, dqanalysisflags::TPCNclsleg2,
@@ -3925,7 +3920,7 @@ struct AnalysisDileptonTrack {
39253920
}
39263921
// table to be written out for ML analysis
39273922
BmesonsTable(event.runNumber(), event.globalIndex(), event.timestamp(),
3928-
fValuesHadron[VarManager::kPairMass], dilepton.mass(), fValuesHadron[VarManager::kDeltaMass], fValuesHadron[VarManager::kPairPt],
3923+
fValuesHadron[VarManager::kPairMass], dilepton.mass(), fValuesHadron[VarManager::kDeltaMass], fValuesHadron[VarManager::kPairPt], fValuesHadron[VarManager::kPairEta], fValuesHadron[VarManager::kPairPhi],
39293924
fValuesHadron[VarManager::kVertexingLxy], fValuesHadron[VarManager::kVertexingLxyz], fValuesHadron[VarManager::kVertexingLz],
39303925
fValuesHadron[VarManager::kVertexingTauxy], fValuesHadron[VarManager::kVertexingTauz], fValuesHadron[VarManager::kCosPointingAngle],
39313926
fValuesHadron[VarManager::kVertexingChi2PCA],
@@ -3934,7 +3929,6 @@ struct AnalysisDileptonTrack {
39343929
track.tpcNSigmaKa(), track.tpcNSigmaPi(), track.tpcNSigmaPr(), track.tofNSigmaKa(),
39353930
lepton1.tpcNSigmaEl(), lepton1.tpcNSigmaPi(), lepton1.tpcNSigmaPr(),
39363931
lepton2.tpcNSigmaEl(), lepton2.tpcNSigmaPi(), lepton2.tpcNSigmaPr(),
3937-
track.dcaXY(), track.dcaZ(), lepton1.dcaXY(), lepton1.dcaZ(), lepton2.dcaXY(), lepton2.dcaZ(),
39383932
track.itsClusterMap(), lepton1.itsClusterMap(), lepton2.itsClusterMap(),
39393933
track.itsChi2NCl(), lepton1.itsChi2NCl(), lepton2.itsChi2NCl(),
39403934
track.tpcNClsFound(), lepton1.tpcNClsFound(), lepton2.tpcNClsFound(),

‎PWGDQ/Tasks/tableReader_withAssoc.cxx‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ DECLARE_SOA_COLUMN(MassDileptonCandidate, massDileptonCandidate, float);
9494
DECLARE_SOA_COLUMN(deltamassBcandidate, deltaMBcandidate, float);
9595
DECLARE_SOA_COLUMN(pTBcandidate, PtBcandidate, float);
9696
DECLARE_SOA_COLUMN(EtaBcandidate, etaBcandidate, float);
97+
DECLARE_SOA_COLUMN(PhiBcandidate, phiBcandidate, float);
9798
DECLARE_SOA_COLUMN(LxyBcandidate, lxyBcandidate, float);
9899
DECLARE_SOA_COLUMN(LxyzBcandidate, lxyzBcandidate, float);
99100
DECLARE_SOA_COLUMN(LzBcandidate, lzBcandidate, float);
@@ -128,12 +129,6 @@ DECLARE_SOA_COLUMN(TPCnsigmaPrleg1, tpcnsigmaPrleg1, float);
128129
DECLARE_SOA_COLUMN(TPCnsigmaElleg2, tpcnsigmaElleg2, float);
129130
DECLARE_SOA_COLUMN(TPCnsigmaPileg2, tpcnsigmaPileg2, float);
130131
DECLARE_SOA_COLUMN(TPCnsigmaPrleg2, tpcnsigmaPrleg2, float);
131-
DECLARE_SOA_COLUMN(DCAXYassoc, dcaXYassoc, float);
132-
DECLARE_SOA_COLUMN(DCAZassoc, dcaZassoc, float);
133-
DECLARE_SOA_COLUMN(DCAXYleg1, dcaXYleg1, float);
134-
DECLARE_SOA_COLUMN(DCAZleg1, dcaZleg1, float);
135-
DECLARE_SOA_COLUMN(DCAXYleg2, dcaXYleg2, float);
136-
DECLARE_SOA_COLUMN(DCAZleg2, dcaZleg2, float);
137132
DECLARE_SOA_COLUMN(ITSClusterMapassoc, itsClusterMapassoc, uint8_t);
138133
DECLARE_SOA_COLUMN(ITSClusterMapleg1, itsClusterMapleg1, uint8_t);
139134
DECLARE_SOA_COLUMN(ITSClusterMapleg2, itsClusterMapleg2, uint8_t);
@@ -173,7 +168,7 @@ DECLARE_SOA_TABLE(MuonAmbiguities, "AOD", "DQMUONAMBA", dqanalysisflags::MuonAmb
173168
DECLARE_SOA_TABLE(Prefilter, "AOD", "DQPREFILTERA", dqanalysisflags::IsBarrelSelectedPrefilter); //! joinable to ReducedTracksAssoc
174169
DECLARE_SOA_TABLE(BmesonCandidates, "AOD", "DQBMESONSA",
175170
dqanalysisflags::RunNumber, dqanalysisflags::EventIdx, dqanalysisflags::EventTimestamp,
176-
dqanalysisflags::massBcandidate, dqanalysisflags::MassDileptonCandidate, dqanalysisflags::deltamassBcandidate, dqanalysisflags::pTBcandidate, dqanalysisflags::EtaBcandidate,
171+
dqanalysisflags::massBcandidate, dqanalysisflags::MassDileptonCandidate, dqanalysisflags::deltamassBcandidate, dqanalysisflags::pTBcandidate, dqanalysisflags::EtaBcandidate, dqanalysisflags::PhiBcandidate,
177172
dqanalysisflags::LxyBcandidate, dqanalysisflags::LxyzBcandidate, dqanalysisflags::LzBcandidate,
178173
dqanalysisflags::TauxyBcandidate, dqanalysisflags::TauzBcandidate, dqanalysisflags::CosPBcandidate, dqanalysisflags::Chi2Bcandidate,
179174
dqanalysisflags::GlobalIndexassoc, dqanalysisflags::GlobalIndexleg1, dqanalysisflags::GlobalIndexleg2,
@@ -182,7 +177,6 @@ DECLARE_SOA_TABLE(BmesonCandidates, "AOD", "DQBMESONSA",
182177
dqanalysisflags::TPCnsigmaKaassoc, dqanalysisflags::TPCnsigmaPiassoc, dqanalysisflags::TPCnsigmaPrassoc, dqanalysisflags::TOFnsigmaKaassoc,
183178
dqanalysisflags::TPCnsigmaElleg1, dqanalysisflags::TPCnsigmaPileg1, dqanalysisflags::TPCnsigmaPrleg1,
184179
dqanalysisflags::TPCnsigmaElleg2, dqanalysisflags::TPCnsigmaPileg2, dqanalysisflags::TPCnsigmaPrleg2,
185-
dqanalysisflags::DCAXYassoc, dqanalysisflags::DCAZassoc, dqanalysisflags::DCAXYleg1, dqanalysisflags::DCAZleg1, dqanalysisflags::DCAXYleg2, dqanalysisflags::DCAZleg2,
186180
dqanalysisflags::ITSClusterMapassoc, dqanalysisflags::ITSClusterMapleg1, dqanalysisflags::ITSClusterMapleg2,
187181
dqanalysisflags::ITSChi2assoc, dqanalysisflags::ITSChi2leg1, dqanalysisflags::ITSChi2leg2,
188182
dqanalysisflags::TPCNclsassoc, dqanalysisflags::TPCNclsleg1, dqanalysisflags::TPCNclsleg2,
@@ -3454,7 +3448,7 @@ struct AnalysisDileptonTrack {
34543448
VarManager::FillDileptonHadron(dilepton, track, fValuesHadron);
34553449
VarManager::FillDileptonTrackVertexing<TCandidateType, TEventFillMap, TTrackFillMap>(event, lepton1, lepton2, track, fValuesHadron);
34563450
// table to be written out for ML analysis
3457-
BmesonsTable(event.runNumber(), event.globalIndex(), event.timestamp(), fValuesHadron[VarManager::kPairMass], dilepton.mass(), fValuesHadron[VarManager::kDeltaMass], fValuesHadron[VarManager::kPairPt], fValuesHadron[VarManager::kPairEta],
3451+
BmesonsTable(event.runNumber(), event.globalIndex(), event.timestamp(), fValuesHadron[VarManager::kPairMass], dilepton.mass(), fValuesHadron[VarManager::kDeltaMass], fValuesHadron[VarManager::kPairPt], fValuesHadron[VarManager::kPairEta], fValuesHadron[VarManager::kPairPhi],
34583452
fValuesHadron[VarManager::kVertexingLxy], fValuesHadron[VarManager::kVertexingLxyz], fValuesHadron[VarManager::kVertexingLz],
34593453
fValuesHadron[VarManager::kVertexingTauxy], fValuesHadron[VarManager::kVertexingTauz], fValuesHadron[VarManager::kCosPointingAngle],
34603454
fValuesHadron[VarManager::kVertexingChi2PCA],
@@ -3463,7 +3457,6 @@ struct AnalysisDileptonTrack {
34633457
track.tpcNSigmaKa(), track.tpcNSigmaPi(), track.tpcNSigmaPr(), track.tofNSigmaKa(),
34643458
lepton1.tpcNSigmaEl(), lepton1.tpcNSigmaPi(), lepton1.tpcNSigmaPr(),
34653459
lepton2.tpcNSigmaEl(), lepton2.tpcNSigmaPi(), lepton2.tpcNSigmaPr(),
3466-
track.dcaXY(), track.dcaZ(), lepton1.dcaXY(), lepton1.dcaZ(), lepton2.dcaXY(), lepton2.dcaZ(),
34673460
track.itsClusterMap(), lepton1.itsClusterMap(), lepton2.itsClusterMap(),
34683461
track.itsChi2NCl(), lepton1.itsChi2NCl(), lepton2.itsChi2NCl(),
34693462
track.tpcNClsFound(), lepton1.tpcNClsFound(), lepton2.tpcNClsFound(),

0 commit comments

Comments
 (0)