Skip to content

Commit 6ff552b

Browse files
torkjellsdatterIda Torkjellsdatter Storehaugalibuild
authored
[PWGDQ] tableReader_withAssoc/dqEfficiency_withAssoc: Columns added to Bmeson table in AnalysisDileptonTrack (#12880)
Co-authored-by: Ida Torkjellsdatter Storehaug <idats@eduroam-193-157-173-128.wlan.uio.no> Co-authored-by: ALICE Action Bot <alibuild@cern.ch>
1 parent f67ba3f commit 6ff552b

File tree

2 files changed

+21
-2
lines changed

2 files changed

+21
-2
lines changed

‎PWGDQ/Tasks/dqEfficiency_withAssoc.cxx‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ DECLARE_SOA_COLUMN(MuonAmbiguityInBunch, muonAmbiguityInBunch, int8_t);
7777
DECLARE_SOA_COLUMN(MuonAmbiguityOutOfBunch, muonAmbiguityOutOfBunch, int8_t); //! Muon track out of bunch ambiguity
7878
DECLARE_SOA_BITMAP_COLUMN(IsBarrelSelectedPrefilter, isBarrelSelectedPrefilter, 32); //! Barrel prefilter decisions (joinable to ReducedTracksAssoc)
7979
// Bcandidate columns for ML analysis of B->Jpsi+K
80+
DECLARE_SOA_COLUMN(RunNumber, runNumber, uint64_t);
81+
DECLARE_SOA_COLUMN(EventIdx, eventIdx, uint64_t);
82+
DECLARE_SOA_COLUMN(EventTimestamp, eventTimestamp, uint64_t);
8083
DECLARE_SOA_COLUMN(massBcandidate, MBcandidate, float);
8184
DECLARE_SOA_COLUMN(MassDileptonCandidate, massDileptonCandidate, float);
8285
DECLARE_SOA_COLUMN(deltaMassBcandidate, deltaMBcandidate, float);
@@ -88,6 +91,9 @@ DECLARE_SOA_COLUMN(TauxyBcandidate, tauxyBcandidate, float);
8891
DECLARE_SOA_COLUMN(TauzBcandidate, tauzBcandidate, float);
8992
DECLARE_SOA_COLUMN(CosPBcandidate, cosPBcandidate, float);
9093
DECLARE_SOA_COLUMN(Chi2Bcandidate, chi2Bcandidate, float);
94+
DECLARE_SOA_COLUMN(GlobalIndexassoc, globalIndexassoc, uint64_t);
95+
DECLARE_SOA_COLUMN(GlobalIndexleg1, globalIndexleg1, uint64_t);
96+
DECLARE_SOA_COLUMN(GlobalIndexleg2, globalIndexleg2, uint64_t);
9197
DECLARE_SOA_COLUMN(Ptassoc, ptassoc, float);
9298
DECLARE_SOA_COLUMN(PINassoc, pINassoc, float);
9399
DECLARE_SOA_COLUMN(Etaassoc, etaassoc, float);
@@ -147,9 +153,11 @@ DECLARE_SOA_TABLE(MuonTrackCuts, "AOD", "DQANAMUONCUTS", dqanalysisflags::IsMuon
147153
DECLARE_SOA_TABLE(MuonAmbiguities, "AOD", "DQMUONAMB", dqanalysisflags::MuonAmbiguityInBunch, dqanalysisflags::MuonAmbiguityOutOfBunch); //! joinable to ReducedMuonTracks
148154
DECLARE_SOA_TABLE(Prefilter, "AOD", "DQPREFILTER", dqanalysisflags::IsBarrelSelectedPrefilter); //! joinable to ReducedTracksAssoc
149155
DECLARE_SOA_TABLE(BmesonCandidates, "AOD", "DQBMESONS",
156+
dqanalysisflags::RunNumber, dqanalysisflags::EventIdx, dqanalysisflags::EventTimestamp,
150157
dqanalysisflags::massBcandidate, dqanalysisflags::MassDileptonCandidate, dqanalysisflags::deltaMassBcandidate, dqanalysisflags::pTBcandidate,
151158
dqanalysisflags::LxyBcandidate, dqanalysisflags::LxyzBcandidate, dqanalysisflags::LzBcandidate,
152159
dqanalysisflags::TauxyBcandidate, dqanalysisflags::TauzBcandidate, dqanalysisflags::CosPBcandidate, dqanalysisflags::Chi2Bcandidate,
160+
dqanalysisflags::GlobalIndexassoc, dqanalysisflags::GlobalIndexleg1, dqanalysisflags::GlobalIndexleg2,
153161
dqanalysisflags::PINassoc, dqanalysisflags::Etaassoc, dqanalysisflags::Ptpair, dqanalysisflags::Etapair,
154162
dqanalysisflags::PINleg1, dqanalysisflags::Etaleg1, dqanalysisflags::PINleg2, dqanalysisflags::Etaleg2,
155163
dqanalysisflags::TPCnsigmaKaassoc, dqanalysisflags::TPCnsigmaPiassoc, dqanalysisflags::TPCnsigmaPrassoc, dqanalysisflags::TOFnsigmaKaassoc,
@@ -3790,10 +3798,12 @@ struct AnalysisDileptonTrack {
37903798
}
37913799
}
37923800
// table to be written out for ML analysis
3793-
BmesonsTable(fValuesHadron[VarManager::kPairMass], dilepton.mass(), fValuesHadron[VarManager::kDeltaMass], fValuesHadron[VarManager::kPairPt],
3801+
BmesonsTable(event.runNumber(), event.globalIndex(), event.timestamp(),
3802+
fValuesHadron[VarManager::kPairMass], dilepton.mass(), fValuesHadron[VarManager::kDeltaMass], fValuesHadron[VarManager::kPairPt],
37943803
fValuesHadron[VarManager::kVertexingLxy], fValuesHadron[VarManager::kVertexingLxyz], fValuesHadron[VarManager::kVertexingLz],
37953804
fValuesHadron[VarManager::kVertexingTauxy], fValuesHadron[VarManager::kVertexingTauz], fValuesHadron[VarManager::kCosPointingAngle],
37963805
fValuesHadron[VarManager::kVertexingChi2PCA],
3806+
track.globalIndex(), lepton1.globalIndex(), lepton2.globalIndex(),
37973807
track.tpcInnerParam(), track.eta(), dilepton.pt(), dilepton.eta(), lepton1.tpcInnerParam(), lepton1.eta(), lepton2.tpcInnerParam(), lepton2.eta(),
37983808
track.tpcNSigmaKa(), track.tpcNSigmaPi(), track.tpcNSigmaPr(), track.tofNSigmaKa(),
37993809
lepton1.tpcNSigmaEl(), lepton1.tpcNSigmaPi(), lepton1.tpcNSigmaPr(),

‎PWGDQ/Tasks/tableReader_withAssoc.cxx‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@ DECLARE_SOA_COLUMN(MuonAmbiguityInBunch, muonAmbiguityInBunch, int8_t);
8686
DECLARE_SOA_COLUMN(MuonAmbiguityOutOfBunch, muonAmbiguityOutOfBunch, int8_t); //! Muon track out of bunch ambiguity
8787
DECLARE_SOA_BITMAP_COLUMN(IsBarrelSelectedPrefilter, isBarrelSelectedPrefilter, 32); //! Barrel prefilter decisions (joinable to ReducedTracksAssoc)
8888
// Bcandidate columns for ML analysis of B->Jpsi+K
89+
DECLARE_SOA_COLUMN(RunNumber, runNumber, uint64_t);
90+
DECLARE_SOA_COLUMN(EventIdx, eventIdx, uint64_t);
91+
DECLARE_SOA_COLUMN(EventTimestamp, eventTimestamp, uint64_t);
8992
DECLARE_SOA_COLUMN(massBcandidate, MBcandidate, float);
9093
DECLARE_SOA_COLUMN(MassDileptonCandidate, massDileptonCandidate, float);
9194
DECLARE_SOA_COLUMN(deltamassBcandidate, deltaMBcandidate, float);
@@ -98,6 +101,9 @@ DECLARE_SOA_COLUMN(TauxyBcandidate, tauxyBcandidate, float);
98101
DECLARE_SOA_COLUMN(TauzBcandidate, tauzBcandidate, float);
99102
DECLARE_SOA_COLUMN(CosPBcandidate, cosPBcandidate, float);
100103
DECLARE_SOA_COLUMN(Chi2Bcandidate, chi2Bcandidate, float);
104+
DECLARE_SOA_COLUMN(GlobalIndexassoc, globalIndexassoc, uint64_t);
105+
DECLARE_SOA_COLUMN(GlobalIndexleg1, globalIndexleg1, uint64_t);
106+
DECLARE_SOA_COLUMN(GlobalIndexleg2, globalIndexleg2, uint64_t);
101107
DECLARE_SOA_COLUMN(Ptassoc, ptassoc, float);
102108
DECLARE_SOA_COLUMN(PINassoc, pINassoc, float);
103109
DECLARE_SOA_COLUMN(Etaassoc, etaassoc, float);
@@ -157,9 +163,11 @@ DECLARE_SOA_TABLE(MuonTrackCuts, "AOD", "DQANAMUONCUTSA", dqanalysisflags::IsMuo
157163
DECLARE_SOA_TABLE(MuonAmbiguities, "AOD", "DQMUONAMBA", dqanalysisflags::MuonAmbiguityInBunch, dqanalysisflags::MuonAmbiguityOutOfBunch); //! joinable to ReducedMuonTracks
158164
DECLARE_SOA_TABLE(Prefilter, "AOD", "DQPREFILTERA", dqanalysisflags::IsBarrelSelectedPrefilter); //! joinable to ReducedTracksAssoc
159165
DECLARE_SOA_TABLE(BmesonCandidates, "AOD", "DQBMESONSA",
166+
dqanalysisflags::RunNumber, dqanalysisflags::EventIdx, dqanalysisflags::EventTimestamp,
160167
dqanalysisflags::massBcandidate, dqanalysisflags::MassDileptonCandidate, dqanalysisflags::deltamassBcandidate, dqanalysisflags::pTBcandidate, dqanalysisflags::EtaBcandidate,
161168
dqanalysisflags::LxyBcandidate, dqanalysisflags::LxyzBcandidate, dqanalysisflags::LzBcandidate,
162169
dqanalysisflags::TauxyBcandidate, dqanalysisflags::TauzBcandidate, dqanalysisflags::CosPBcandidate, dqanalysisflags::Chi2Bcandidate,
170+
dqanalysisflags::GlobalIndexassoc, dqanalysisflags::GlobalIndexleg1, dqanalysisflags::GlobalIndexleg2,
163171
dqanalysisflags::PINassoc, dqanalysisflags::Etaassoc, dqanalysisflags::Ptpair, dqanalysisflags::Etapair,
164172
dqanalysisflags::PINleg1, dqanalysisflags::Etaleg1, dqanalysisflags::PINleg2, dqanalysisflags::Etaleg2,
165173
dqanalysisflags::TPCnsigmaKaassoc, dqanalysisflags::TPCnsigmaPiassoc, dqanalysisflags::TPCnsigmaPrassoc, dqanalysisflags::TOFnsigmaKaassoc,
@@ -3459,10 +3467,11 @@ struct AnalysisDileptonTrack {
34593467
VarManager::FillDileptonHadron(dilepton, track, fValuesHadron);
34603468
VarManager::FillDileptonTrackVertexing<TCandidateType, TEventFillMap, TTrackFillMap>(event, lepton1, lepton2, track, fValuesHadron);
34613469
// table to be written out for ML analysis
3462-
BmesonsTable(fValuesHadron[VarManager::kPairMass], dilepton.mass(), fValuesHadron[VarManager::kDeltaMass], fValuesHadron[VarManager::kPairPt], fValuesHadron[VarManager::kPairEta],
3470+
BmesonsTable(event.runNumber(), event.globalIndex(), event.timestamp(), fValuesHadron[VarManager::kPairMass], dilepton.mass(), fValuesHadron[VarManager::kDeltaMass], fValuesHadron[VarManager::kPairPt], fValuesHadron[VarManager::kPairEta],
34633471
fValuesHadron[VarManager::kVertexingLxy], fValuesHadron[VarManager::kVertexingLxyz], fValuesHadron[VarManager::kVertexingLz],
34643472
fValuesHadron[VarManager::kVertexingTauxy], fValuesHadron[VarManager::kVertexingTauz], fValuesHadron[VarManager::kCosPointingAngle],
34653473
fValuesHadron[VarManager::kVertexingChi2PCA],
3474+
track.globalIndex(), lepton1.globalIndex(), lepton2.globalIndex(),
34663475
track.tpcInnerParam(), track.eta(), dilepton.pt(), dilepton.eta(), lepton1.tpcInnerParam(), lepton1.eta(), lepton2.tpcInnerParam(), lepton2.eta(),
34673476
track.tpcNSigmaKa(), track.tpcNSigmaPi(), track.tpcNSigmaPr(), track.tofNSigmaKa(),
34683477
lepton1.tpcNSigmaEl(), lepton1.tpcNSigmaPi(), lepton1.tpcNSigmaPr(),

0 commit comments

Comments
 (0)