Skip to content

Commit 7d4ed54

Browse files
mcoquet642mcoquet642
committed
Simplifying FillPairVertexing in VarManager
1 parent 6350ace commit 7d4ed54

7 files changed

Lines changed: 70 additions & 153 deletions

‎PWGDQ/Core/VarManager.h‎

Lines changed: 59 additions & 138 deletions
Large diffs are not rendered by default.

‎PWGDQ/Tasks/dqEfficiency.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,7 @@ struct AnalysisSameEventPairing {
795795
VarManager::FillPair<TPairType, TTrackFillMap>(t1, t2);
796796
// secondary vertexing is not implemented for e-mu pairs so we need to hide this function from the e-mu analysis for now
797797
if constexpr ((TPairType == VarManager::kDecayToEE) || (TPairType == VarManager::kDecayToMuMu)) {
798-
VarManager::FillPairVertexing<TPairType, TEventFillMap, TTrackFillMap>(event, t1, t2, fPropToPCA, VarManager::fgValues);
798+
VarManager::FillPairVertexing<TPairType, TEventFillMap, TTrackFillMap>(event, t1, t2, VarManager::fgValues);
799799
}
800800

801801
// run MC matching for this pair

‎PWGDQ/Tasks/dqEfficiency_withAssoc.cxx‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1612,7 +1612,6 @@ struct AnalysisSameEventPairing {
16121612
Configurable<bool> polarTables{"cfgPolarTables", false, "Produce tables with dilepton polarization information"};
16131613
Configurable<bool> useKFVertexing{"cfgUseKFVertexing", false, "Use KF Particle for secondary vertex reconstruction (DCAFitter is used by default)"};
16141614
Configurable<bool> useAbsDCA{"cfgUseAbsDCA", false, "Use absolute DCA minimization instead of chi^2 minimization in secondary vertexing"};
1615-
Configurable<bool> propToPCA{"cfgPropToPCA", false, "Propagate tracks to secondary vertex"};
16161615
Configurable<bool> noCorr{"cfgNoCorrFwdProp", false, "Do not correct for MCS effects in track propagation"};
16171616
Configurable<std::string> collisionSystem{"syst", "pp", "Collision system, pp or PbPb"};
16181617
Configurable<float> centerMassEnergy{"energy", 13600, "Center of mass energy in GeV"};
@@ -2307,7 +2306,7 @@ struct AnalysisSameEventPairing {
23072306
VarManager::FillPairCollision<TPairType, TTrackFillMap>(event, t1, t2);
23082307
}
23092308
if constexpr (TTwoProngFitter) {
2310-
VarManager::FillPairVertexing<TPairType, TEventFillMap, TTrackFillMap>(event, t1, t2, fConfigOptions.propToPCA);
2309+
VarManager::FillPairVertexing<TPairType, TEventFillMap, TTrackFillMap>(event, t1, t2);
23112310
}
23122311
if constexpr (eventHasQvector) {
23132312
VarManager::FillPairVn<TPairType>(t1, t2);
@@ -2399,7 +2398,7 @@ struct AnalysisSameEventPairing {
23992398
VarManager::FillPairCollision<TPairType, TTrackFillMap>(event, t1, t2);
24002399
}
24012400
if constexpr (TTwoProngFitter) {
2402-
VarManager::FillPairVertexing<TPairType, TEventFillMap, TTrackFillMap>(event, t1, t2, fConfigOptions.propToPCA);
2401+
VarManager::FillPairVertexing<TPairType, TEventFillMap, TTrackFillMap>(event, t1, t2);
24032402
}
24042403
if constexpr (eventHasQvector) {
24052404
VarManager::FillPairVn<TPairType>(t1, t2);
@@ -3354,7 +3353,6 @@ struct AnalysisAsymmetricPairing {
33543353

33553354
Configurable<bool> fConfigUseKFVertexing{"cfgUseKFVertexing", false, "Use KF Particle for secondary vertex reconstruction (DCAFitter is used by default)"};
33563355
Configurable<bool> fConfigUseAbsDCA{"cfgUseAbsDCA", false, "Use absolute DCA minimization instead of chi^2 minimization in secondary vertexing"};
3357-
Configurable<bool> fConfigPropToPCA{"cfgPropToPCA", false, "Propagate tracks to secondary vertex"};
33583356
Configurable<std::string> fConfigLutPath{"lutPath", "GLO/Param/MatLUT", "Path of the Lut parametrization"};
33593357

33603358
Configurable<std::string> fConfigMCGenSignals{"cfgBarrelMCGenSignals", "", "Comma separated list of MC signals (generated)"};
@@ -3887,7 +3885,7 @@ struct AnalysisAsymmetricPairing {
38873885

38883886
VarManager::FillPair<TPairType, TTrackFillMap>(t1, t2);
38893887
if constexpr (TTwoProngFitter) {
3890-
VarManager::FillPairVertexing<TPairType, TEventFillMap, TTrackFillMap>(event, t1, t2, fConfigPropToPCA);
3888+
VarManager::FillPairVertexing<TPairType, TEventFillMap, TTrackFillMap>(event, t1, t2);
38913889
}
38923890

38933891
// Fill histograms

‎PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1828,7 +1828,7 @@ struct AnalysisSameEventPairing {
18281828
VarManager::FillPairCollision<TPairType, TTrackFillMap>(event, t1, t2);
18291829
}
18301830
if constexpr (TTwoProngFitter) {
1831-
VarManager::FillPairVertexing<TPairType, TEventFillMap, TTrackFillMap>(event, t1, t2, fConfigOptions.propToPCA);
1831+
VarManager::FillPairVertexing<TPairType, TEventFillMap, TTrackFillMap>(event, t1, t2);
18321832
if (fConfigOptions.recomputePV) {
18331833
VarManager::SetPVrecalculationKF(false);
18341834
VarManager::ResetValues(VarManager::kVertexingLxyProjectedRecalculatePV, VarManager::kVertexingLxyProjectedRecalculatePV + 1);
@@ -1921,7 +1921,7 @@ struct AnalysisSameEventPairing {
19211921
VarManager::FillPairCollision<TPairType, TTrackFillMap>(event, t1, t2);
19221922
}
19231923
if constexpr (TTwoProngFitter) {
1924-
VarManager::FillPairVertexing<TPairType, TEventFillMap, TTrackFillMap>(event, t1, t2, fConfigOptions.propToPCA);
1924+
VarManager::FillPairVertexing<TPairType, TEventFillMap, TTrackFillMap>(event, t1, t2);
19251925
}
19261926
if constexpr (eventHasQvector) {
19271927
VarManager::FillPairVn<TPairType>(t1, t2);

‎PWGDQ/Tasks/tableReader.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1466,7 +1466,7 @@ struct AnalysisSameEventPairing {
14661466
VarManager::FillPair<TPairType, TTrackFillMap>(t1, t2);
14671467
if constexpr ((TPairType == pairTypeEE) || (TPairType == pairTypeMuMu)) { // call this just for ee or mumu pairs
14681468
if constexpr (TTwoProngFitter == true) {
1469-
VarManager::FillPairVertexing<TPairType, TEventFillMap, TTrackFillMap>(event, t1, t2, fPropToPCA);
1469+
VarManager::FillPairVertexing<TPairType, TEventFillMap, TTrackFillMap>(event, t1, t2);
14701470
}
14711471
if constexpr (eventHasQvector) {
14721472
VarManager::FillPairVn<TEventFillMap, TPairType>(t1, t2);

‎PWGDQ/Tasks/tableReader_withAssoc.h‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1383,7 +1383,6 @@ struct AnalysisSameEventPairing {
13831383
o2::framework::Configurable<bool> polarTables{"cfgPolarTables", false, "Produce tables with dilepton polarization information"};
13841384
o2::framework::Configurable<bool> useKFVertexing{"cfgUseKFVertexing", false, "Use KF Particle for secondary vertex reconstruction (DCAFitter is used by default)"};
13851385
o2::framework::Configurable<bool> useAbsDCA{"cfgUseAbsDCA", false, "Use absolute DCA minimization instead of chi^2 minimization in secondary vertexing"};
1386-
o2::framework::Configurable<bool> propToPCA{"cfgPropToPCA", false, "Propagate tracks to secondary vertex"};
13871386
o2::framework::Configurable<bool> noCorr{"cfgNoCorrFwdProp", false, "Do not correct for MCS effects in track propagation"};
13881387
o2::framework::Configurable<std::string> collisionSystem{"syst", "pp", "Collision system, pp or PbPb"};
13891388
o2::framework::Configurable<float> centerMassEnergy{"energy", 13600, "Center of mass energy in GeV"};
@@ -2038,7 +2037,7 @@ struct AnalysisSameEventPairing {
20382037
VarManager::FillPairCollision<TPairType, TTrackFillMap>(event, t1, t2);
20392038
}
20402039
if constexpr (TTwoProngFitter) {
2041-
VarManager::FillPairVertexing<TPairType, TEventFillMap, TTrackFillMap>(event, t1, t2, fConfigOptions.propToPCA);
2040+
VarManager::FillPairVertexing<TPairType, TEventFillMap, TTrackFillMap>(event, t1, t2);
20422041
}
20432042
if constexpr (eventHasQvector) {
20442043
VarManager::FillPairVn<TPairType>(t1, t2);
@@ -2166,7 +2165,7 @@ struct AnalysisSameEventPairing {
21662165
VarManager::FillPairCollision<TPairType, TTrackFillMap>(event, t1, t2);
21672166
}
21682167
if constexpr (TTwoProngFitter) {
2169-
VarManager::FillPairVertexing<TPairType, TEventFillMap, TTrackFillMap>(event, t1, t2, fConfigOptions.propToPCA);
2168+
VarManager::FillPairVertexing<TPairType, TEventFillMap, TTrackFillMap>(event, t1, t2);
21702169
}
21712170
if constexpr (eventHasQvector) {
21722171
VarManager::FillPairVn<TPairType>(t1, t2);
@@ -3204,7 +3203,6 @@ struct AnalysisAsymmetricPairing {
32043203

32053204
o2::framework::Configurable<bool> fConfigUseKFVertexing{"cfgUseKFVertexing", false, "Use KF Particle for secondary vertex reconstruction (DCAFitter is used by default)"};
32063205
o2::framework::Configurable<bool> fConfigUseAbsDCA{"cfgUseAbsDCA", false, "Use absolute DCA minimization instead of chi^2 minimization in secondary vertexing"};
3207-
o2::framework::Configurable<bool> fConfigPropToPCA{"cfgPropToPCA", false, "Propagate tracks to secondary vertex"};
32083206
o2::framework::Configurable<std::string> fConfigLutPath{"lutPath", "GLO/Param/MatLUT", "Path of the Lut parametrization"};
32093207
o2::framework::Configurable<bool> fConfigFetchInteractionRate{"cfgFetchInteractionRate", false, "Fetch event-wise interaction rate from the CCDB"};
32103208
o2::framework::Configurable<std::string> fConfigIRSource{"cfgIRSource", "ZNC hadronic", "Estimator of the interaction rate (Recommended: pp --> T0VTX, Pb-Pb --> ZNC hadronic)"};
@@ -3619,7 +3617,7 @@ struct AnalysisAsymmetricPairing {
36193617

36203618
VarManager::FillPair<TPairType, TTrackFillMap>(t1, t2);
36213619
if constexpr (TTwoProngFitter) {
3622-
VarManager::FillPairVertexing<TPairType, TEventFillMap, TTrackFillMap>(event, t1, t2, fConfigPropToPCA);
3620+
VarManager::FillPairVertexing<TPairType, TEventFillMap, TTrackFillMap>(event, t1, t2);
36233621
}
36243622

36253623
// Fill histograms

‎PWGDQ/Tasks/tableReader_withAssoc_direct.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1765,7 +1765,7 @@ struct AnalysisSameEventPairing {
17651765
}
17661766

17671767
if constexpr (TTwoProngFitter) {
1768-
VarManager::FillPairVertexing<TPairType, TEventFillMap, TTrackFillMap>(event, t1, t2, fConfigOptions.propToPCA);
1768+
VarManager::FillPairVertexing<TPairType, TEventFillMap, TTrackFillMap>(event, t1, t2);
17691769
o2::dataformats::VertexBase pvRefit;
17701770
if (fConfigOptions.recomputePV) {
17711771
VarManager::SetPVrecalculationKF(false);

0 commit comments

Comments
 (0)