Skip to content

Commit 9fe70f3

Browse files
torkjellsdatterIda Torkjellsdatter Storehaugalibuild
authored
[PWGDQ] Tasks/dqEfficiency_withAssoc: Extended B meson table (#11685)
Co-authored-by: Ida Torkjellsdatter Storehaug <idats@eduroam-193-157-226-72.wlan.uio.no> Co-authored-by: ALICE Action Bot <alibuild@cern.ch>
1 parent ee37b1e commit 9fe70f3

File tree

2 files changed

+68
-14
lines changed

2 files changed

+68
-14
lines changed

‎PWGDQ/Tasks/dqEfficiency_withAssoc.cxx‎

Lines changed: 62 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,42 @@ DECLARE_SOA_COLUMN(TauxyBcandidate, tauxyBcandidate, float);
8484
DECLARE_SOA_COLUMN(TauzBcandidate, tauzBcandidate, float);
8585
DECLARE_SOA_COLUMN(CosPBcandidate, cosPBcandidate, float);
8686
DECLARE_SOA_COLUMN(Chi2Bcandidate, chi2Bcandidate, float);
87-
DECLARE_SOA_COLUMN(DCAxyzBetweenProngs, dcaxyzBetweenProngs, float);
87+
DECLARE_SOA_COLUMN(PINassoc, pINassoc, float);
88+
DECLARE_SOA_COLUMN(Etaassoc, etaassoc, float);
89+
DECLARE_SOA_COLUMN(Ptpair, ptpair, float);
90+
DECLARE_SOA_COLUMN(Etapair, etapair, float);
91+
DECLARE_SOA_COLUMN(PINleg1, pINleg1, float);
92+
DECLARE_SOA_COLUMN(Etaleg1, etaleg1, float);
93+
DECLARE_SOA_COLUMN(PINleg2, pINleg2, float);
94+
DECLARE_SOA_COLUMN(Etaleg2, etaleg2, float);
95+
DECLARE_SOA_COLUMN(TPCnsigmaKaassoc, tpcnsigmaKaassoc, float);
96+
DECLARE_SOA_COLUMN(TPCnsigmaPiassoc, tpcnsigmaPiassoc, float);
97+
DECLARE_SOA_COLUMN(TPCnsigmaPrassoc, tpcnsigmaPrassoc, float);
98+
DECLARE_SOA_COLUMN(TOFnsigmaKaassoc, tofnsigmaKaassoc, float);
99+
DECLARE_SOA_COLUMN(TPCnsigmaElleg1, tpcnsigmaElleg1, float);
100+
DECLARE_SOA_COLUMN(TPCnsigmaPileg1, tpcnsigmaPileg1, float);
101+
DECLARE_SOA_COLUMN(TPCnsigmaPrleg1, tpcnsigmaPrleg1, float);
102+
DECLARE_SOA_COLUMN(TPCnsigmaElleg2, tpcnsigmaElleg2, float);
103+
DECLARE_SOA_COLUMN(TPCnsigmaPileg2, tpcnsigmaPileg2, float);
104+
DECLARE_SOA_COLUMN(TPCnsigmaPrleg2, tpcnsigmaPrleg2, float);
105+
DECLARE_SOA_COLUMN(DCAXYassoc, dcaXYassoc, float);
106+
DECLARE_SOA_COLUMN(DCAZassoc, dcaZassoc, float);
107+
DECLARE_SOA_COLUMN(DCAXYleg1, dcaXYleg1, float);
108+
DECLARE_SOA_COLUMN(DCAZleg1, dcaZleg1, float);
109+
DECLARE_SOA_COLUMN(DCAXYleg2, dcaXYleg2, float);
110+
DECLARE_SOA_COLUMN(DCAZleg2, dcaZleg2, float);
111+
DECLARE_SOA_COLUMN(ITSClusterMapassoc, itsClusterMapassoc, uint8_t);
112+
DECLARE_SOA_COLUMN(ITSClusterMapleg1, itsClusterMapleg1, uint8_t);
113+
DECLARE_SOA_COLUMN(ITSClusterMapleg2, itsClusterMapleg2, uint8_t);
114+
DECLARE_SOA_COLUMN(ITSChi2assoc, itsChi2assoc, float);
115+
DECLARE_SOA_COLUMN(ITSChi2leg1, itsChi2leg1, float);
116+
DECLARE_SOA_COLUMN(ITSChi2leg2, itsChi2leg2, float);
117+
DECLARE_SOA_COLUMN(TPCNclsassoc, tpcNclsassoc, float);
118+
DECLARE_SOA_COLUMN(TPCNclsleg1, tpcNclsleg1, float);
119+
DECLARE_SOA_COLUMN(TPCNclsleg2, tpcNclsleg2, float);
120+
DECLARE_SOA_COLUMN(TPCChi2assoc, tpcChi2assoc, float);
121+
DECLARE_SOA_COLUMN(TPCChi2leg1, tpcChi2leg1, float);
122+
DECLARE_SOA_COLUMN(TPCChi2leg2, tpcChi2leg2, float);
88123
DECLARE_SOA_COLUMN(McFlag, mcFlag, int8_t);
89124
DECLARE_SOA_BITMAP_COLUMN(IsJpsiFromBSelected, isJpsiFromBSelected, 32);
90125
// Candidate columns for prompt-non-prompt JPsi separation
@@ -107,8 +142,17 @@ DECLARE_SOA_TABLE(Prefilter, "AOD", "DQPREFILTER", dqanalysisflags::IsBarrelSele
107142
DECLARE_SOA_TABLE(BmesonCandidates, "AOD", "DQBMESONS",
108143
dqanalysisflags::massBcandidate, dqanalysisflags::MassDileptonCandidate, dqanalysisflags::deltaMassBcandidate, dqanalysisflags::pTBcandidate,
109144
dqanalysisflags::LxyBcandidate, dqanalysisflags::LxyzBcandidate, dqanalysisflags::LzBcandidate,
110-
dqanalysisflags::TauxyBcandidate, dqanalysisflags::TauzBcandidate, dqanalysisflags::DCAxyzBetweenProngs,
111-
dqanalysisflags::CosPBcandidate, dqanalysisflags::Chi2Bcandidate,
145+
dqanalysisflags::TauxyBcandidate, dqanalysisflags::TauzBcandidate, dqanalysisflags::CosPBcandidate, dqanalysisflags::Chi2Bcandidate,
146+
dqanalysisflags::PINassoc, dqanalysisflags::Etaassoc, dqanalysisflags::Ptpair, dqanalysisflags::Etapair,
147+
dqanalysisflags::PINleg1, dqanalysisflags::Etaleg1, dqanalysisflags::PINleg2, dqanalysisflags::Etaleg2,
148+
dqanalysisflags::TPCnsigmaKaassoc, dqanalysisflags::TPCnsigmaPiassoc, dqanalysisflags::TPCnsigmaPrassoc, dqanalysisflags::TOFnsigmaKaassoc,
149+
dqanalysisflags::TPCnsigmaElleg1, dqanalysisflags::TPCnsigmaPileg1, dqanalysisflags::TPCnsigmaPrleg1,
150+
dqanalysisflags::TPCnsigmaElleg2, dqanalysisflags::TPCnsigmaPileg2, dqanalysisflags::TPCnsigmaPrleg2,
151+
dqanalysisflags::DCAXYassoc, dqanalysisflags::DCAZassoc, dqanalysisflags::DCAXYleg1, dqanalysisflags::DCAZleg1, dqanalysisflags::DCAXYleg2, dqanalysisflags::DCAZleg2,
152+
dqanalysisflags::ITSClusterMapassoc, dqanalysisflags::ITSClusterMapleg1, dqanalysisflags::ITSClusterMapleg2,
153+
dqanalysisflags::ITSChi2assoc, dqanalysisflags::ITSChi2leg1, dqanalysisflags::ITSChi2leg2,
154+
dqanalysisflags::TPCNclsassoc, dqanalysisflags::TPCNclsleg1, dqanalysisflags::TPCNclsleg2,
155+
dqanalysisflags::TPCChi2assoc, dqanalysisflags::TPCChi2leg1, dqanalysisflags::TPCChi2leg2,
112156
dqanalysisflags::IsJpsiFromBSelected, dqanalysisflags::IsBarrelSelected, dqanalysisflags::McFlag);
113157
DECLARE_SOA_TABLE(JPsieeCandidates, "AOD", "DQPSEUDOPROPER", dqanalysisflags::Massee, dqanalysisflags::Ptee, dqanalysisflags::Lxyee, dqanalysisflags::LxyeePoleMass, dqanalysisflags::Lzee, dqanalysisflags::AmbiguousInBunchPairs, dqanalysisflags::AmbiguousOutOfBunchPairs, dqanalysisflags::Corrassoc);
114158
} // namespace o2::aod
@@ -3630,6 +3674,21 @@ struct AnalysisDileptonTrack {
36303674
mcDecision |= (static_cast<uint32_t>(1) << isig);
36313675
}
36323676
}
3677+
// table to be written out for ML analysis
3678+
BmesonsTable(fValuesHadron[VarManager::kPairMass], dilepton.mass(), fValuesHadron[VarManager::kDeltaMass], fValuesHadron[VarManager::kPairPt],
3679+
fValuesHadron[VarManager::kVertexingLxy], fValuesHadron[VarManager::kVertexingLxyz], fValuesHadron[VarManager::kVertexingLz],
3680+
fValuesHadron[VarManager::kVertexingTauxy], fValuesHadron[VarManager::kVertexingTauz], fValuesHadron[VarManager::kCosPointingAngle],
3681+
fValuesHadron[VarManager::kVertexingChi2PCA],
3682+
track.tpcInnerParam(), track.eta(), dilepton.pt(), dilepton.eta(), lepton1.tpcInnerParam(), lepton1.eta(), lepton2.tpcInnerParam(), lepton2.eta(),
3683+
track.tpcNSigmaKa(), track.tpcNSigmaPi(), track.tpcNSigmaPr(), track.tofNSigmaKa(),
3684+
lepton1.tpcNSigmaEl(), lepton1.tpcNSigmaPi(), lepton1.tpcNSigmaPr(),
3685+
lepton2.tpcNSigmaEl(), lepton2.tpcNSigmaPi(), lepton2.tpcNSigmaPr(),
3686+
track.dcaXY(), track.dcaZ(), lepton1.dcaXY(), lepton1.dcaZ(), lepton2.dcaXY(), lepton2.dcaZ(),
3687+
track.itsClusterMap(), lepton1.itsClusterMap(), lepton2.itsClusterMap(),
3688+
track.itsChi2NCl(), lepton1.itsChi2NCl(), lepton2.itsChi2NCl(),
3689+
track.tpcNClsFound(), lepton1.tpcNClsFound(), lepton2.tpcNClsFound(),
3690+
track.tpcChi2NCl(), lepton1.tpcChi2NCl(), lepton2.tpcChi2NCl(),
3691+
dilepton.filterMap_raw(), trackSelection, mcDecision);
36333692
}
36343693

36353694
if constexpr (TCandidateType == VarManager::kDstarToD0KPiPi) {
@@ -3739,11 +3798,6 @@ struct AnalysisDileptonTrack {
37393798
}
37403799
} // end loop over track cuts
37413800
} // end loop over dilepton cuts
3742-
// table to be written out for ML analysis
3743-
BmesonsTable(fValuesHadron[VarManager::kPairMass], dilepton.mass(), fValuesHadron[VarManager::kDeltaMass], fValuesHadron[VarManager::kPairPt],
3744-
fValuesHadron[VarManager::kVertexingLxy], fValuesHadron[VarManager::kVertexingLxyz], fValuesHadron[VarManager::kVertexingLz],
3745-
fValuesHadron[VarManager::kVertexingTauxy], fValuesHadron[VarManager::kVertexingTauz], fValuesHadron[VarManager::kKFDCAxyzBetweenProngs],
3746-
fValuesHadron[VarManager::kCosPointingAngle], fValuesHadron[VarManager::kVertexingChi2PCA], dilepton.filterMap_raw(), trackSelection, mcDecision);
37473801
} // end loop over associations
37483802
} // end loop over dileptons
37493803
}

‎PWGDQ/Tasks/tableReader_withAssoc.cxx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,13 @@ DECLARE_SOA_COLUMN(TauxyBcandidate, tauxyBcandidate, float);
9494
DECLARE_SOA_COLUMN(TauzBcandidate, tauzBcandidate, float);
9595
DECLARE_SOA_COLUMN(CosPBcandidate, cosPBcandidate, float);
9696
DECLARE_SOA_COLUMN(Chi2Bcandidate, chi2Bcandidate, float);
97-
DECLARE_SOA_COLUMN(Ptassoc, ptassoc, float);
97+
DECLARE_SOA_COLUMN(PINassoc, pINassoc, float);
9898
DECLARE_SOA_COLUMN(Etaassoc, etaassoc, float);
9999
DECLARE_SOA_COLUMN(Ptpair, ptpair, float);
100100
DECLARE_SOA_COLUMN(Etapair, etapair, float);
101-
DECLARE_SOA_COLUMN(Ptleg1, ptleg1, float);
101+
DECLARE_SOA_COLUMN(PINleg1, pINleg1, float);
102102
DECLARE_SOA_COLUMN(Etaleg1, etaleg1, float);
103-
DECLARE_SOA_COLUMN(Ptleg2, ptleg2, float);
103+
DECLARE_SOA_COLUMN(PINleg2, pINleg2, float);
104104
DECLARE_SOA_COLUMN(Etaleg2, etaleg2, float);
105105
DECLARE_SOA_COLUMN(TPCnsigmaKaassoc, tpcnsigmaKaassoc, float);
106106
DECLARE_SOA_COLUMN(TPCnsigmaPiassoc, tpcnsigmaPiassoc, float);
@@ -152,8 +152,8 @@ DECLARE_SOA_TABLE(BmesonCandidates, "AOD", "DQBMESONSA",
152152
dqanalysisflags::massBcandidate, dqanalysisflags::MassDileptonCandidate, dqanalysisflags::deltamassBcandidate, dqanalysisflags::pTBcandidate, dqanalysisflags::EtaBcandidate,
153153
dqanalysisflags::LxyBcandidate, dqanalysisflags::LxyzBcandidate, dqanalysisflags::LzBcandidate,
154154
dqanalysisflags::TauxyBcandidate, dqanalysisflags::TauzBcandidate, dqanalysisflags::CosPBcandidate, dqanalysisflags::Chi2Bcandidate,
155-
dqanalysisflags::Ptassoc, dqanalysisflags::Etaassoc, dqanalysisflags::Ptpair, dqanalysisflags::Etapair,
156-
dqanalysisflags::Ptleg1, dqanalysisflags::Etaleg1, dqanalysisflags::Ptleg2, dqanalysisflags::Etaleg2,
155+
dqanalysisflags::PINassoc, dqanalysisflags::Etaassoc, dqanalysisflags::Ptpair, dqanalysisflags::Etapair,
156+
dqanalysisflags::PINleg1, dqanalysisflags::Etaleg1, dqanalysisflags::PINleg2, dqanalysisflags::Etaleg2,
157157
dqanalysisflags::TPCnsigmaKaassoc, dqanalysisflags::TPCnsigmaPiassoc, dqanalysisflags::TPCnsigmaPrassoc, dqanalysisflags::TOFnsigmaKaassoc,
158158
dqanalysisflags::TPCnsigmaElleg1, dqanalysisflags::TPCnsigmaPileg1, dqanalysisflags::TPCnsigmaPrleg1,
159159
dqanalysisflags::TPCnsigmaElleg2, dqanalysisflags::TPCnsigmaPileg2, dqanalysisflags::TPCnsigmaPrleg2,
@@ -3268,7 +3268,7 @@ struct AnalysisDileptonTrack {
32683268
fValuesHadron[VarManager::kVertexingLxy], fValuesHadron[VarManager::kVertexingLxyz], fValuesHadron[VarManager::kVertexingLz],
32693269
fValuesHadron[VarManager::kVertexingTauxy], fValuesHadron[VarManager::kVertexingTauz], fValuesHadron[VarManager::kCosPointingAngle],
32703270
fValuesHadron[VarManager::kVertexingChi2PCA],
3271-
track.pt(), track.eta(), dilepton.pt(), dilepton.eta(), lepton1.pt(), lepton1.eta(), lepton2.pt(), lepton2.eta(),
3271+
track.tpcInnerParam(), track.eta(), dilepton.pt(), dilepton.eta(), lepton1.tpcInnerParam(), lepton1.eta(), lepton2.tpcInnerParam(), lepton2.eta(),
32723272
track.tpcNSigmaKa(), track.tpcNSigmaPi(), track.tpcNSigmaPr(), track.tofNSigmaKa(),
32733273
lepton1.tpcNSigmaEl(), lepton1.tpcNSigmaPi(), lepton1.tpcNSigmaPr(),
32743274
lepton2.tpcNSigmaEl(), lepton2.tpcNSigmaPi(), lepton2.tpcNSigmaPr(),

0 commit comments

Comments
 (0)