Skip to content

Commit 550d4c7

Browse files
JonathanWitteJonathanWitte
committed
Improve naming, remove comments, replace redundant calculations
1 parent 434829c commit 550d4c7

4 files changed

Lines changed: 41 additions & 52 deletions

File tree

‎PWGDQ/Core/VarManager.cxx‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1131,14 +1131,14 @@ void VarManager::SetDefaultVarNames()
11311131
fgVariableUnits[kDCAxy2] = "cm";
11321132
fgVariableNames[kDCAz2] = "DCA_{z}";
11331133
fgVariableUnits[kDCAz2] = "cm";
1134-
fgVariableNames[kDCASigxy1] = "DCA_{xy}/#sigma_{DCA_{xy}}";
1135-
fgVariableUnits[kDCASigxy1] = "";
1136-
fgVariableNames[kDCASigz1] = "DCA_{z}/#sigma_{DCA_{z}}";
1137-
fgVariableUnits[kDCASigz1] = "";
1138-
fgVariableNames[kDCASigxy2] = "DCA_{xy}/#sigma_{DCA_{xy}}";
1139-
fgVariableUnits[kDCASigxy2] = "";
1140-
fgVariableNames[kDCASigz2] = "DCA_{z}/#sigma_{DCA_{z}}";
1141-
fgVariableUnits[kDCASigz2] = "";
1134+
fgVariableNames[kDCAxyOverSig1] = "DCA_{xy}/#sigma_{DCA_{xy}}";
1135+
fgVariableUnits[kDCAxyOverSig1] = "";
1136+
fgVariableNames[kDCAzOverSig1] = "DCA_{z}/#sigma_{DCA_{z}}";
1137+
fgVariableUnits[kDCAzOverSig1] = "";
1138+
fgVariableNames[kDCAxyOverSig2] = "DCA_{xy}/#sigma_{DCA_{xy}}";
1139+
fgVariableUnits[kDCAxyOverSig2] = "";
1140+
fgVariableNames[kDCAzOverSig2] = "DCA_{z}/#sigma_{DCA_{z}}";
1141+
fgVariableUnits[kDCAzOverSig2] = "";
11421142
fgVariableNames[kTPCnSigmaEl] = "n #sigma_{e}^{TPC}";
11431143
fgVariableUnits[kTPCnSigmaEl] = "";
11441144
fgVariableNames[kTPCnSigmaEl_Corr] = "n #sigma_{e}^{TPC} Corr.";
@@ -2366,8 +2366,8 @@ void VarManager::SetDefaultVarNames()
23662366
fgVarNamesMap["kCharge1"] = kCharge1;
23672367
fgVarNamesMap["kDCAxy1"] = kDCAxy1;
23682368
fgVarNamesMap["kDCAz1"] = kDCAz1;
2369-
fgVarNamesMap["kDCASigxy1"] = kDCASigxy1;
2370-
fgVarNamesMap["kDCASigz1"] = kDCASigz1;
2369+
fgVarNamesMap["kDCAxyOverSig1"] = kDCAxyOverSig1;
2370+
fgVarNamesMap["kDCAzOverSig1"] = kDCAzOverSig1;
23712371
fgVarNamesMap["kITSclusterMap1"] = kITSclusterMap1;
23722372
fgVarNamesMap["kTPCnSigmaEl1"] = kTPCnSigmaEl1;
23732373
fgVarNamesMap["kPin_leg1"] = kPin_leg1;
@@ -2378,8 +2378,8 @@ void VarManager::SetDefaultVarNames()
23782378
fgVarNamesMap["kCharge2"] = kCharge2;
23792379
fgVarNamesMap["kDCAxy2"] = kDCAxy2;
23802380
fgVarNamesMap["kDCAz2"] = kDCAz2;
2381-
fgVarNamesMap["kDCASigxy2"] = kDCASigxy2;
2382-
fgVarNamesMap["kDCASigz2"] = kDCASigz2;
2381+
fgVarNamesMap["kDCAxyOverSig2"] = kDCAxyOverSig2;
2382+
fgVarNamesMap["kDCAzOverSig2"] = kDCAzOverSig2;
23832383
fgVarNamesMap["kITSclusterMap2"] = kITSclusterMap2;
23842384
fgVarNamesMap["kTPCnSigmaEl2"] = kTPCnSigmaEl2;
23852385
fgVarNamesMap["kPin"] = kPin;

‎PWGDQ/Core/VarManager.h‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -558,8 +558,8 @@ class VarManager : public TObject
558558
kCharge1,
559559
kDCAxy1,
560560
kDCAz1,
561-
kDCASigxy1, // DCAxy / sqrt(cYY) of leg 1
562-
kDCASigz1, // DCAz / sqrt(cZZ) of leg 1
561+
kDCAxyOverSig1,
562+
kDCAzOverSig1,
563563
kITSclusterMap1,
564564
kTPCnSigmaEl1,
565565
kPin_leg1,
@@ -570,8 +570,8 @@ class VarManager : public TObject
570570
kCharge2,
571571
kDCAxy2,
572572
kDCAz2,
573-
kDCASigxy2, // DCAxy / sqrt(cYY) of leg 2
574-
kDCASigz2, // DCAz / sqrt(cZZ) of leg 2
573+
kDCAxyOverSig2,
574+
kDCAzOverSig2,
575575
kITSclusterMap2,
576576
kTPCnSigmaEl2,
577577

@@ -4028,19 +4028,18 @@ void VarManager::FillPair(T1 const& t1, T2 const& t2, float* values)
40284028
values[kDCAxy2] = dca2XY;
40294029
values[kDCAz2] = dca2Z;
40304030

4031-
values[kDCASigxy1] = dca1XY / std::sqrt(t1.cYY());
4032-
values[kDCASigz1] = dca1Z / std::sqrt(t1.cZZ());
4033-
values[kDCASigxy2] = dca2XY / std::sqrt(t2.cYY());
4034-
values[kDCASigz2] = dca2Z / std::sqrt(t2.cZZ());
4031+
double dca1sigXY = dca1XY / std::sqrt(t1.cYY());
4032+
double dca2sigXY = dca2XY / std::sqrt(t2.cYY());
4033+
double dca1sigZ = dca1Z / std::sqrt(t1.cZZ());
4034+
double dca2sigZ = dca2Z / std::sqrt(t2.cZZ());
4035+
4036+
values[kDCAxyOverSig1] = dca1sigXY;
4037+
values[kDCAzOverSig1] = dca1sigZ;
4038+
values[kDCAxyOverSig2] = dca2sigXY;
4039+
values[kDCAzOverSig2] = dca2sigZ;
40354040

40364041
if (fgUsedVars[kQuadDCAabsXY] || fgUsedVars[kQuadDCAsigXY] || fgUsedVars[kQuadDCAabsZ] || fgUsedVars[kQuadDCAsigZ] || fgUsedVars[kQuadDCAsigXYZ] || fgUsedVars[kSignQuadDCAsigXY]) {
40374042
// Quantities based on the barrel tables
4038-
4039-
double dca1sigXY = dca1XY / std::sqrt(t1.cYY());
4040-
double dca2sigXY = dca2XY / std::sqrt(t2.cYY());
4041-
double dca1sigZ = dca1Z / std::sqrt(t1.cZZ());
4042-
double dca2sigZ = dca2Z / std::sqrt(t2.cZZ());
4043-
40444043
values[kQuadDCAabsXY] = std::sqrt((dca1XY * dca1XY + dca2XY * dca2XY) / 2);
40454044
values[kQuadDCAsigXY] = std::sqrt((dca1sigXY * dca1sigXY + dca2sigXY * dca2sigXY) / 2);
40464045
values[kQuadDCAabsZ] = std::sqrt((dca1Z * dca1Z + dca2Z * dca2Z) / 2);
@@ -5094,10 +5093,6 @@ void VarManager::FillPairVertexing(C const& collision, T const& t1, T const& t2,
50945093
values[kVertexingLz] = std::sqrt(values[kVertexingLz]);
50955094
values[kVertexingLxyz] = std::sqrt(values[kVertexingLxyz]);
50965095

5097-
values[kVertexingLxyOverErr] = values[kVertexingLxy] / values[kVertexingLxyErr];
5098-
values[kVertexingLzOverErr] = values[kVertexingLz] / values[kVertexingLzErr];
5099-
values[kVertexingLxyzOverErr] = values[kVertexingLxyz] / values[kVertexingLxyzErr];
5100-
51015096
values[kVertexingTauz] = -dz * v12.M() / (TMath::Abs(v12.Pz()) * o2::constants::physics::LightSpeedCm2NS);
51025097
values[kVertexingTauxy] = values[kVertexingLxy] * v12.M() / (v12.Pt() * o2::constants::physics::LightSpeedCm2NS);
51035098

‎PWGDQ/Tasks/dqEfficiency_withAssoc.cxx‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -194,10 +194,10 @@ DECLARE_SOA_COLUMN(Lxyzee, lxyzee, float); //! kVertex
194194
DECLARE_SOA_COLUMN(LxyzeeOverErr, lxyzeeOverErr, float); //! kVertexingLxyzOverErr
195195
DECLARE_SOA_COLUMN(Chi2PCAee, chi2PCAee, float); //! kVertexingChi2PCA
196196
DECLARE_SOA_COLUMN(CosPAee, cosPAee, float); //! kCosPointingAngle
197-
DECLARE_SOA_COLUMN(DcaSigXY1, dcaSigXY1, float); //! leg-1 DCAxy / sqrt(cYY), kDCASigxy1
198-
DECLARE_SOA_COLUMN(DcaSigZ1, dcaSigZ1, float); //! leg-1 DCAz / sqrt(cZZ), kDCASigz1
199-
DECLARE_SOA_COLUMN(DcaSigXY2, dcaSigXY2, float); //! leg-2 DCAxy / sqrt(cYY), kDCASigxy2
200-
DECLARE_SOA_COLUMN(DcaSigZ2, dcaSigZ2, float); //! leg-2 DCAz / sqrt(cZZ), kDCASigz2
197+
DECLARE_SOA_COLUMN(DcaXYOverSig1, dcaXYOverSig1, float);
198+
DECLARE_SOA_COLUMN(DcaZOverSig1, dcaZOverSig1, float);
199+
DECLARE_SOA_COLUMN(DcaXYOverSig2, dcaXYOverSig2, float);
200+
DECLARE_SOA_COLUMN(DcaZOverSig2, dcaZOverSig2, float);
201201
DECLARE_SOA_COLUMN(DeltaEta, deltaEta, float);
202202
DECLARE_SOA_COLUMN(DeltaPhi, deltaPhi, float);
203203
// Candidate columns efficiency calculation for prompt-non-prompt JPsi separation
@@ -247,9 +247,9 @@ DECLARE_SOA_TABLE(JPsieeCandidates, "AOD", "DQPSEUDOPROPER",
247247
dqanalysisflags::LxyeeProjected, dqanalysisflags::LxyeeOverErr, dqanalysisflags::Lxyzee, dqanalysisflags::LxyzeeOverErr,
248248
dqanalysisflags::Chi2PCAee, dqanalysisflags::CosPAee,
249249
dqanalysisflags::Vx, dqanalysisflags::Vy, dqanalysisflags::Vz,
250-
dqanalysisflags::Ptleg1, dqanalysisflags::Etaleg1, dqanalysisflags::DcaXY1, dqanalysisflags::DcaZ1, dqanalysisflags::DcaSigXY1, dqanalysisflags::DcaSigZ1,
250+
dqanalysisflags::Ptleg1, dqanalysisflags::Etaleg1, dqanalysisflags::DcaXY1, dqanalysisflags::DcaZ1, dqanalysisflags::DcaXYOverSig1, dqanalysisflags::DcaZOverSig1,
251251
dqanalysisflags::ITSClusterMapleg1, dqanalysisflags::ITSChi2leg1,
252-
dqanalysisflags::Ptleg2, dqanalysisflags::Etaleg2, dqanalysisflags::DcaXY2, dqanalysisflags::DcaZ2, dqanalysisflags::DcaSigXY2, dqanalysisflags::DcaSigZ2,
252+
dqanalysisflags::Ptleg2, dqanalysisflags::Etaleg2, dqanalysisflags::DcaXY2, dqanalysisflags::DcaZ2, dqanalysisflags::DcaXYOverSig2, dqanalysisflags::DcaZOverSig2,
253253
dqanalysisflags::ITSClusterMapleg2, dqanalysisflags::ITSChi2leg2,
254254
dqanalysisflags::AmbiguousInBunchPairs, dqanalysisflags::AmbiguousOutOfBunchPairs, dqanalysisflags::Corrassoc,
255255
dqanalysisflags::MultiplicityFT0C, dqanalysisflags::PercentileFT0C, dqanalysisflags::MultiplicityNContrib);
@@ -2396,9 +2396,6 @@ struct AnalysisSameEventPairing {
23962396
}
23972397
}
23982398
}
2399-
// flat table for prompt / non-prompt BDT training: one row per MC-matched opposite-sign pair
2400-
// (not per cut; select cuts offline via PairFilter). Kept identical to tableReader_withAssoc.
2401-
// Only meaningful with track covariances, the two-prong fitter and an event vertex covariance:
24022399
constexpr bool eventHasVtxCovForTable = ((TEventFillMap & VarManager::ObjTypes::ReducedEventVtxCov) > 0);
24032400
if constexpr ((TTrackFillMap & VarManager::ObjTypes::ReducedTrackBarrelPID) > 0 && trackHasCov && TTwoProngFitter && eventHasVtxCovForTable) {
24042401
// kVertexingProcCode == 0: the fit failed; FillPairVertexing then returns early without updating the
@@ -2413,9 +2410,9 @@ struct AnalysisSameEventPairing {
24132410
VarManager::fgValues[VarManager::kVertexingLxyProjected], VarManager::fgValues[VarManager::kVertexingLxyOverErr], VarManager::fgValues[VarManager::kVertexingLxyz], VarManager::fgValues[VarManager::kVertexingLxyzOverErr],
24142411
VarManager::fgValues[VarManager::kVertexingChi2PCA], VarManager::fgValues[VarManager::kCosPointingAngle],
24152412
VarManager::fgValues[VarManager::kVtxX], VarManager::fgValues[VarManager::kVtxY], VarManager::fgValues[VarManager::kVtxZ],
2416-
t1.pt(), t1.eta(), VarManager::fgValues[VarManager::kDCAxy1], VarManager::fgValues[VarManager::kDCAz1], VarManager::fgValues[VarManager::kDCASigxy1], VarManager::fgValues[VarManager::kDCASigz1],
2413+
t1.pt(), t1.eta(), VarManager::fgValues[VarManager::kDCAxy1], VarManager::fgValues[VarManager::kDCAz1], VarManager::fgValues[VarManager::kDCAxyOverSig1], VarManager::fgValues[VarManager::kDCAzOverSig1],
24172414
VarManager::fgValues[VarManager::kITSclusterMap1], t1.itsChi2NCl(),
2418-
t2.pt(), t2.eta(), VarManager::fgValues[VarManager::kDCAxy2], VarManager::fgValues[VarManager::kDCAz2], VarManager::fgValues[VarManager::kDCASigxy2], VarManager::fgValues[VarManager::kDCASigz2],
2415+
t2.pt(), t2.eta(), VarManager::fgValues[VarManager::kDCAxy2], VarManager::fgValues[VarManager::kDCAz2], VarManager::fgValues[VarManager::kDCAxyOverSig2], VarManager::fgValues[VarManager::kDCAzOverSig2],
24192416
VarManager::fgValues[VarManager::kITSclusterMap2], t2.itsChi2NCl(),
24202417
ambiInBunch, ambiOutOfBunch, isCorrectAssoc_leg1 && isCorrectAssoc_leg2,
24212418
VarManager::fgValues[VarManager::kMultFT0C], VarManager::fgValues[VarManager::kCentFT0C], VarManager::fgValues[VarManager::kVtxNcontribReal]);

‎PWGDQ/Tasks/tableReader_withAssoc.h‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -192,10 +192,10 @@ DECLARE_SOA_COLUMN(Lxyzee, lxyzee, float); //! kVer
192192
DECLARE_SOA_COLUMN(LxyzeeOverErr, lxyzeeOverErr, float); //! kVertexingLxyzOverErr
193193
DECLARE_SOA_COLUMN(Chi2PCAee, chi2PCAee, float); //! kVertexingChi2PCA
194194
DECLARE_SOA_COLUMN(CosPAee, cosPAee, float); //! kCosPointingAngle
195-
DECLARE_SOA_COLUMN(DcaSigXY1, dcaSigXY1, float); //! leg-1 DCAxy / sqrt(cYY), kDCASigxy1
196-
DECLARE_SOA_COLUMN(DcaSigZ1, dcaSigZ1, float); //! leg-1 DCAz / sqrt(cZZ), kDCASigz1
197-
DECLARE_SOA_COLUMN(DcaSigXY2, dcaSigXY2, float); //! leg-2 DCAxy / sqrt(cYY), kDCASigxy2
198-
DECLARE_SOA_COLUMN(DcaSigZ2, dcaSigZ2, float); //! leg-2 DCAz / sqrt(cZZ), kDCASigz2
195+
DECLARE_SOA_COLUMN(DcaXYOverSig1, dcaXYOverSig1, float);
196+
DECLARE_SOA_COLUMN(DcaZOverSig1, dcaZOverSig1, float);
197+
DECLARE_SOA_COLUMN(DcaXYOverSig2, dcaXYOverSig2, float);
198+
DECLARE_SOA_COLUMN(DcaZOverSig2, dcaZOverSig2, float);
199199

200200

201201
// Candidate columns for JPsi/muon correlations
@@ -238,9 +238,9 @@ DECLARE_SOA_TABLE(JPsieeCandidates, "AOD", "DQPSEUDOPROPER",
238238
dqanalysisflags::LxyeeProjected, dqanalysisflags::LxyeeOverErr, dqanalysisflags::Lxyzee, dqanalysisflags::LxyzeeOverErr,
239239
dqanalysisflags::Chi2PCAee, dqanalysisflags::CosPAee,
240240
dqanalysisflags::Vx, dqanalysisflags::Vy, dqanalysisflags::Vz,
241-
dqanalysisflags::Ptleg1, dqanalysisflags::Etaleg1, dqanalysisflags::DcaXY1, dqanalysisflags::DcaZ1, dqanalysisflags::DcaSigXY1, dqanalysisflags::DcaSigZ1,
241+
dqanalysisflags::Ptleg1, dqanalysisflags::Etaleg1, dqanalysisflags::DcaXY1, dqanalysisflags::DcaZ1, dqanalysisflags::DcaXYOverSig1, dqanalysisflags::DcaZOverSig1,
242242
dqanalysisflags::ITSClusterMapleg1, dqanalysisflags::ITSChi2leg1,
243-
dqanalysisflags::Ptleg2, dqanalysisflags::Etaleg2, dqanalysisflags::DcaXY2, dqanalysisflags::DcaZ2, dqanalysisflags::DcaSigXY2, dqanalysisflags::DcaSigZ2,
243+
dqanalysisflags::Ptleg2, dqanalysisflags::Etaleg2, dqanalysisflags::DcaXY2, dqanalysisflags::DcaZ2, dqanalysisflags::DcaXYOverSig2, dqanalysisflags::DcaZOverSig2,
244244
dqanalysisflags::ITSClusterMapleg2, dqanalysisflags::ITSChi2leg2,
245245
dqanalysisflags::AmbiguousInBunchPairs, dqanalysisflags::AmbiguousOutOfBunchPairs, dqanalysisflags::Corrassoc,
246246
dqanalysisflags::MultiplicityFT0C, dqanalysisflags::PercentileFT0C, dqanalysisflags::MultiplicityNContrib);
@@ -2181,9 +2181,6 @@ struct AnalysisSameEventPairing {
21812181
(fConfigML.applyBDT && fOutputMlPsi2ee.size() > 1) ? VarManager::fgValues[VarManager::kBdtPrompt] : -999.f,
21822182
(fConfigML.applyBDT && fOutputMlPsi2ee.size() > 2) ? VarManager::fgValues[VarManager::kBdtNonprompt] : -999.f);
21832183
}
2184-
// flat table for prompt / non-prompt BDT training: one row per pair (not per cut; select cuts offline via PairFilter)
2185-
// Only meaningful with track covariances, the two-prong fitter and an event vertex covariance:
2186-
// otherwise the vertexing variables are not computed and fgValues would hold stale values from a previous pair.
21872184
constexpr bool eventHasVtxCovForTable = ((TEventFillMap & VarManager::ObjTypes::ReducedEventVtxCov) > 0);
21882185
if constexpr (trackHasCov && TTwoProngFitter && eventHasVtxCovForTable) {
21892186
const bool ambiInBunch = (twoTrackFilter & (static_cast<uint32_t>(1) << 28)) || (twoTrackFilter & (static_cast<uint32_t>(1) << 29));
@@ -2198,9 +2195,9 @@ struct AnalysisSameEventPairing {
21982195
VarManager::fgValues[VarManager::kVertexingLxyProjected], VarManager::fgValues[VarManager::kVertexingLxyOverErr], VarManager::fgValues[VarManager::kVertexingLxyz], VarManager::fgValues[VarManager::kVertexingLxyzOverErr],
21992196
VarManager::fgValues[VarManager::kVertexingChi2PCA], VarManager::fgValues[VarManager::kCosPointingAngle],
22002197
VarManager::fgValues[VarManager::kVtxX], VarManager::fgValues[VarManager::kVtxY], VarManager::fgValues[VarManager::kVtxZ],
2201-
t1.pt(), t1.eta(), VarManager::fgValues[VarManager::kDCAxy1], VarManager::fgValues[VarManager::kDCAz1], VarManager::fgValues[VarManager::kDCASigxy1], VarManager::fgValues[VarManager::kDCASigz1],
2198+
t1.pt(), t1.eta(), VarManager::fgValues[VarManager::kDCAxy1], VarManager::fgValues[VarManager::kDCAz1], VarManager::fgValues[VarManager::kDCAxyOverSig1], VarManager::fgValues[VarManager::kDCAzOverSig1],
22022199
VarManager::fgValues[VarManager::kITSclusterMap1], t1.itsChi2NCl(),
2203-
t2.pt(), t2.eta(), VarManager::fgValues[VarManager::kDCAxy2], VarManager::fgValues[VarManager::kDCAz2], VarManager::fgValues[VarManager::kDCASigxy2], VarManager::fgValues[VarManager::kDCASigz2],
2200+
t2.pt(), t2.eta(), VarManager::fgValues[VarManager::kDCAxy2], VarManager::fgValues[VarManager::kDCAz2], VarManager::fgValues[VarManager::kDCAxyOverSig2], VarManager::fgValues[VarManager::kDCAzOverSig2],
22042201
VarManager::fgValues[VarManager::kITSclusterMap2], t2.itsChi2NCl(),
22052202
ambiInBunch, ambiOutOfBunch, true,
22062203
VarManager::fgValues[VarManager::kMultFT0C], VarManager::fgValues[VarManager::kCentFT0C], VarManager::fgValues[VarManager::kVtxNcontribReal]);

0 commit comments

Comments
 (0)