[PWGHF] Remove propagateTracksToVertex also for other HF creators (#14541)

fgrosa · web-flow · commit f3d6d5c9333f · 2026-01-20T01:26:54.000+01:00
diff --git a/PWGHF/D2H/TableProducer/candidateCreatorB0Reduced.cxx b/PWGHF/D2H/TableProducer/candidateCreatorB0Reduced.cxx
@@ -192,8 +192,7 @@ struct HfCandidateCreatorB0Reduced {
         registry.fill(HIST("hCovSVXX"), covMatrixPCA[0]);
         registry.fill(HIST("hCovPVXX"), covMatrixPV[0]);
 
-        // propagate D and Pi to the B0 vertex
-        df3.propagateTracksToVertex();
+        // get D and Pi tracks (propagated to the B0 vertex if propagateToPCA==true)
         // track.getPxPyPzGlo(pVec) modifies pVec of track
         df3.getTrack(0).getPxPyPzGlo(pVecD0);       // momentum of D at the B0 vertex
         df3.getTrack(1).getPxPyPzGlo(pVecSoftPion); // momentum of SoftPi at the B0 vertex
@@ -299,8 +298,7 @@ struct HfCandidateCreatorB0Reduced {
         registry.fill(HIST("hCovSVXX"), covMatrixPCA[0]);
         registry.fill(HIST("hCovPVXX"), covMatrixPV[0]);
 
-        // propagate D and Pi to the B0 vertex
-        df2.propagateTracksToVertex();
+        // get D and Pi tracks (propagated to the B0 vertex if propagateToPCA==true)
         // track.getPxPyPzGlo(pVec) modifies pVec of track
         df2.getTrack(0).getPxPyPzGlo(pVecD);    // momentum of D at the B0 vertex
         df2.getTrack(1).getPxPyPzGlo(pVecPion); // momentum of Pi at the B0 vertex
diff --git a/PWGHF/D2H/TableProducer/candidateCreatorBToJpsiReduced.cxx b/PWGHF/D2H/TableProducer/candidateCreatorBToJpsiReduced.cxx
@@ -238,8 +238,7 @@ struct HfCandidateCreatorBToJpsiReduced {
           registry.fill(HIST("hCovSVXX"), covMatrixPCA[0]);
           registry.fill(HIST("hCovPVXX"), covMatrixPV[0]);
 
-          // propagate Jpsi daugthers and K to the B+ vertex
-          df3.propagateTracksToVertex();
+          // get JPsi daughters and K tracks (propagated to the B+ vertex if propagateToPCA==true)
           // track.getPxPyPzGlo(pVec) modifies pVec of track
           df3.getTrack(0).getPxPyPzGlo(pVecDauPos);   // momentum of positive Jpsi daughter at the B+ vertex
           df3.getTrack(1).getPxPyPzGlo(pVecDauNeg);   // momentum of negative Jpsi daughter at the B+ vertex
@@ -309,8 +308,7 @@ struct HfCandidateCreatorBToJpsiReduced {
             registry.fill(HIST("hCovSVXX"), covMatrixPCA[0]);
             registry.fill(HIST("hCovPVXX"), covMatrixPV[0]);
 
-            // propagate Jpsi and phi to the Bs vertex
-            df4.propagateTracksToVertex();
+            // get JPsi daughters and K tracks (propagated to the Bs vertex if propagateToPCA==true)
             // track.getPxPyPzGlo(pVec) modifies pVec of track
             df4.getTrack(0).getPxPyPzGlo(pVecDauPos);   // momentum of Jpsi at the B+ vertex
             df4.getTrack(1).getPxPyPzGlo(pVecDauNeg);   // momentum of Jpsi at the B+ vertex
diff --git a/PWGHF/D2H/TableProducer/candidateCreatorBplusReduced.cxx b/PWGHF/D2H/TableProducer/candidateCreatorBplusReduced.cxx
@@ -169,8 +169,7 @@ struct HfCandidateCreatorBplusReduced {
         registry.fill(HIST("hCovSVXX"), covMatrixPCA[0]);
         registry.fill(HIST("hCovPVXX"), covMatrixPV[0]);
 
-        // propagate D0 and Pi to the B+ vertex
-        df2.propagateTracksToVertex();
+        // get D and Pi tracks (propagated to the B+ vertex if propagateToPCA==true)
         // track.getPxPyPzGlo(pVec) modifies pVec of track
         df2.getTrack(0).getPxPyPzGlo(pVecD0);   // momentum of D0 at the B+ vertex
         df2.getTrack(1).getPxPyPzGlo(pVecPion); // momentum of Pi at the B+ vertex
diff --git a/PWGHF/D2H/TableProducer/candidateCreatorBsReduced.cxx b/PWGHF/D2H/TableProducer/candidateCreatorBsReduced.cxx
@@ -169,8 +169,7 @@ struct HfCandidateCreatorBsReduced {
         registry.fill(HIST("hCovSVXX"), covMatrixPCA[0]);
         registry.fill(HIST("hCovPVXX"), covMatrixPV[0]);
 
-        // propagate Ds and Pi to the Bs vertex
-        df2.propagateTracksToVertex();
+        // get Ds and Pi tracks (propagated to the B0 vertex if propagateToPCA==true)
         // track.getPxPyPzGlo(pVec) modifies pVec of track
         df2.getTrack(0).getPxPyPzGlo(pVecD);    // momentum of Ds at the Bs vertex
         df2.getTrack(1).getPxPyPzGlo(pVecPion); // momentum of Pi at the Bs vertex
diff --git a/PWGHF/D2H/TableProducer/candidateCreatorLbReduced.cxx b/PWGHF/D2H/TableProducer/candidateCreatorLbReduced.cxx
@@ -189,8 +189,7 @@ struct HfCandidateCreatorLbReduced {
         registry.fill(HIST("hCovSVXX"), covMatrixPCA[0]);
         registry.fill(HIST("hCovPVXX"), covMatrixPV[0]);
 
-        // propagate Lc and Pi to the Lb vertex
-        df2.propagateTracksToVertex();
+        // get Lc and Pi tracks (propagated to the Lb vertex if propagateToPCA==true)
         // track.getPxPyPzGlo(pVec) modifies pVec of track
         df2.getTrack(0).getPxPyPzGlo(pVecLc);   // momentum of Lc at the Lb vertex
         df2.getTrack(1).getPxPyPzGlo(pVecPion); // momentum of Pi at the Lb vertex
diff --git a/PWGHF/D2H/TableProducer/dataCreatorJpsiHadReduced.cxx b/PWGHF/D2H/TableProducer/dataCreatorJpsiHadReduced.cxx
@@ -881,7 +881,6 @@ struct HfDataCreatorJpsiHadReduced {
           std::array<float, 3> pVecBPlus{}, pVec0{}, pVec1{}, pVec2{};
 
           auto secondaryVertexBPlus = df3.getPCACandidate();
-          df3.propagateTracksToVertex();
           df3.getTrack(0).getPxPyPzGlo(pVec0);
           df3.getTrack(1).getPxPyPzGlo(pVec1);
           df3.getTrack(2).getPxPyPzGlo(pVec2);
@@ -969,7 +968,6 @@ struct HfDataCreatorJpsiHadReduced {
             std::array<float, 3> pVecBS{}, pVec0{}, pVec1{}, pVecPhi{};
 
             auto secondaryVertexBS = df4.getPCACandidate();
-            df4.propagateTracksToVertex();
             df4.getTrack(0).getPxPyPzGlo(pVec0);
             df4.getTrack(1).getPxPyPzGlo(pVec1);
             df4.getTrack(2).getPxPyPzGlo(pVec2);
diff --git a/PWGHF/TableProducer/candidateCreatorB0.cxx b/PWGHF/TableProducer/candidateCreatorB0.cxx
@@ -345,8 +345,7 @@ struct HfCandidateCreatorB0 {
           hCovSVXX->Fill(covMatrixPCA[0]);
           hCovPVXX->Fill(covMatrixPV[0]);
 
-          // propagate D and Pi to the B0 vertex
-          df2.propagateTracksToVertex();
+          // get D and Pi tracks (propagated to the B0 vertex if propagateToPCA==true)
           // track.getPxPyPzGlo(pVec) modifies pVec of track
           df2.getTrack(0).getPxPyPzGlo(pVecD);    // momentum of D at the B0 vertex
           df2.getTrack(1).getPxPyPzGlo(pVecPion); // momentum of Pi at the B0 vertex
diff --git a/PWGHF/TableProducer/candidateCreatorBplus.cxx b/PWGHF/TableProducer/candidateCreatorBplus.cxx
@@ -326,7 +326,7 @@ struct HfCandidateCreatorBplus {
           }
           hCandidatesB->Fill(SVFitting::FitOk);
 
-          dfB.propagateTracksToVertex();        // propagate the bachelor and D0 to the B+ vertex
+          // get D and Pi tracks (propagated to the B+ vertex if propagateToPCA==true)
           trackD0.getPxPyPzGlo(pVecD0);         // momentum of D0 at the B+ vertex
           trackParCovPi.getPxPyPzGlo(pVecBach); // momentum of pi+ at the B+ vertex
 
diff --git a/PWGHF/TableProducer/candidateCreatorBs.cxx b/PWGHF/TableProducer/candidateCreatorBs.cxx
@@ -324,8 +324,7 @@ struct HfCandidateCreatorBs {
           auto chi2PCA = df2.getChi2AtPCACandidate();
           auto covMatrixPCA = df2.calcPCACovMatrixFlat();
 
-          // propagate Ds and Pi to the Bs vertex
-          df2.propagateTracksToVertex();
+          // get Ds and Pi tracks (propagated to the Bs vertex if propagateToPCA==true)
           // track.getPxPyPzGlo(pVec) modifies pVec of track
           df2.getTrack(0).getPxPyPzGlo(pVecDs);   // momentum of Ds at the Bs vertex
           df2.getTrack(1).getPxPyPzGlo(pVecPion); // momentum of Pi at the Bs vertex
diff --git a/PWGHF/TableProducer/candidateCreatorCascade.cxx b/PWGHF/TableProducer/candidateCreatorCascade.cxx
@@ -277,7 +277,6 @@ struct HfCandidateCreatorCascade {
       auto chi2PCA = df.getChi2AtPCACandidate();
       auto covMatrixPCA = df.calcPCACovMatrixFlat();
       registry.fill(HIST("hCovSVXX"), covMatrixPCA[0]); // FIXME: Calculation of errorDecayLength(XY) gives wrong values without this line.
-      // do I have to call "df.propagateTracksToVertex();"?
       auto trackParVarV0 = df.getTrack(0);
       auto trackParVarBach = df.getTrack(1);
 
diff --git a/PWGHF/TableProducer/candidateCreatorDstar.cxx b/PWGHF/TableProducer/candidateCreatorDstar.cxx
@@ -286,8 +286,6 @@ struct HfCandidateCreatorDstar {
       registry.fill(HIST("Refit/hCovSVXZ"), covMatrixPCA[3]);
       registry.fill(HIST("Refit/hCovSVZZ"), covMatrixPCA[5]);
 
-      // Doubt:................Below, track object are at secondary vertex!
-      // < track param propagated to V0 candidate (no check for the candidate validity). propagateTracksToVertex must be called in advance
       auto trackD0ProngParVar0 = df.getTrack(0);
       auto trackD0ProngParVar1 = df.getTrack(1);
 
diff --git a/PWGHF/TableProducer/candidateCreatorLb.cxx b/PWGHF/TableProducer/candidateCreatorLb.cxx
@@ -215,7 +215,7 @@ struct HfCandidateCreatorLb {
         auto chi2PCA = df2.getChi2AtPCACandidate();
         auto covMatrixPCA = df2.calcPCACovMatrixFlat();
 
-        df2.propagateTracksToVertex();
+        // get Lc and Pi tracks (propagated to the Lb vertex if propagateToPCA==true)
         df2.getTrack(0).getPxPyPzGlo(pvecLc);
         df2.getTrack(1).getPxPyPzGlo(pvecPion);
 
diff --git a/PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx b/PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx
@@ -105,7 +105,7 @@ struct HfCandidateCreatorXic0Omegac0 {
   Produces<aod::HfCandToXiPiKfQa> rowKfXic0Qa;
   Produces<aod::HfCandToOmegaKaKf> kfCandidateOmegaKaData;
 
-  Configurable<bool> propagateToPCA{"propagateToPCA", false, "create tracks version propagated to PCA"};
+  Configurable<bool> propagateToPCA{"propagateToPCA", true, "create tracks version propagated to PCA"};
   Configurable<bool> useAbsDCA{"useAbsDCA", true, "Minimise abs. distance rather than chi2"};
   Configurable<bool> useWeightedFinalPCA{"useWeightedFinalPCA", true, "Recalculate vertex position using track covariances, effective only if useAbsDCA is true"};
   Configurable<double> maxR{"maxR", 200., "reject PCA's above this radius"};
@@ -114,7 +114,6 @@ struct HfCandidateCreatorXic0Omegac0 {
   Configurable<double> minParamChange{"minParamChange", 1.e-3, "stop iterations if largest change of any X is smaller than this"};
   Configurable<double> minRelChi2Change{"minRelChi2Change", 0.9, "stop iterations is chi2/chi2old > this"};
   Configurable<double> maxChi2{"maxChi2", 100., "discard vertices with chi2/Nprongs > this (or sum{DCAi^2}/Nprongs for abs. distance minimization)"};
-  Configurable<bool> refitWithMatCorr{"refitWithMatCorr", true, "when doing propagateTracksToVertex, propagate tracks to vtx with material corrections and rerun minimization"};
   Configurable<bool> rejDiffCollTrack{"rejDiffCollTrack", true, "Reject tracks coming from different collisions"};
   Configurable<bool> fillAllHist{"fillAllHist", true, "Fill additional KF histograms to check selector cuts"};
   Configurable<bool> doCascadePreselection{"doCascadePreselection", true, "Use invariant mass and dcaXY cuts to preselect cascade candidates"};
@@ -377,7 +376,6 @@ struct HfCandidateCreatorXic0Omegac0 {
     df.setMaxChi2(maxChi2);
     df.setUseAbsDCA(useAbsDCA);
     df.setWeightedFinalPCA(useWeightedFinalPCA);
-    df.setRefitWithMatCorr(refitWithMatCorr);
 
     ccdb->setURL(ccdbUrl);
     ccdb->setCaching(true);
@@ -545,10 +543,6 @@ struct HfCandidateCreatorXic0Omegac0 {
       auto vertexCharmBaryonFromFitter = df.getPCACandidate();
       std::array<float, 3> pVecCascAsD{};
       std::array<float, 3> pVecCharmBachelorAsD{};
-      df.propagateTracksToVertex();
-      if (!df.isPropagateTracksToVertexDone()) {
-        continue;
-      }
       df.getTrack(0).getPxPyPzGlo(pVecCascAsD);
       df.getTrack(1).getPxPyPzGlo(pVecCharmBachelorAsD);
       std::array<float, 3> pVecCharmBaryon = {pVecCascAsD[0] + pVecCharmBachelorAsD[0], pVecCascAsD[1] + pVecCharmBachelorAsD[1], pVecCascAsD[2] + pVecCharmBachelorAsD[2]};
diff --git a/PWGHF/TableProducer/candidateCreatorXicc.cxx b/PWGHF/TableProducer/candidateCreatorXicc.cxx
@@ -173,7 +173,6 @@ struct HfCandidateCreatorXicc {
         auto chi2PCA = df2.getChi2AtPCACandidate();
         auto covMatrixPCA = df2.calcPCACovMatrixFlat();
 
-        df2.propagateTracksToVertex();
         df2.getTrack(0).getPxPyPzGlo(pvecxic);
         df2.getTrack(1).getPxPyPzGlo(pvecpion);
 
diff --git a/PWGHF/TableProducer/trackIndexSkimCreator.cxx b/PWGHF/TableProducer/trackIndexSkimCreator.cxx
@@ -3265,7 +3265,6 @@ struct HfTrackIndexSkimCreatorCascades {
             if (nCand2 == 0) {
               continue;
             }
-            df2.propagateTracksToVertex();        // propagate the bach and V0 to the Lc vertex
             df2.getTrack(0).getPxPyPzGlo(pVecV0); // take the momentum at the Lc vertex
             df2.getTrack(1).getPxPyPzGlo(pVecBach);
           }
@@ -3333,7 +3332,6 @@ struct HfTrackIndexSkimCreatorLfCascades {
     Configurable<double> minParamChange{"minParamChange", 1.e-3, "stop iterations if largest change of any X is smaller than this"};
     Configurable<double> minRelChi2Change{"minRelChi2Change", 0.9, "stop iterations is chi2/chi2old > this"};
     Configurable<double> maxChi2{"maxChi2", 100., "discard vertices with chi2/Nprongs > this (or sum{DCAi^2}/Nprongs for abs. distance minimization)"};
-    Configurable<bool> refitWithMatCorr{"refitWithMatCorr", true, "when doing propagateTracksToVertex, propagate tracks to vtx with material corrections and rerun minimization"};
 
     // Selection criteria
     // selections have been set to run2 lambda dedicated cuts
@@ -3604,7 +3602,6 @@ struct HfTrackIndexSkimCreatorLfCascades {
       const auto magneticField = o2::base::Propagator::Instance()->getNominalBz(); // z component
 
       df2.setBz(magneticField);
-      df2.setRefitWithMatCorr(config.refitWithMatCorr);
 
       // cascade loop
       const auto thisCollId = collision.globalIndex();
diff --git a/PWGHF/TableProducer/treeCreatorTccToD0D0Pi.cxx b/PWGHF/TableProducer/treeCreatorTccToD0D0Pi.cxx
@@ -599,7 +599,6 @@ struct HfTreeCreatorTccToD0D0Pi {
               }
               hCandidatesTcc->Fill(SVFitting::FitOk);
 
-              dfTcc.propagateTracksToVertex();        // propagate the softpi and D0 pair to the Tcc vertex
               trackD1.getPxPyPzGlo(pVecD1);           // momentum of D1 at the Tcc vertex
               trackD2.getPxPyPzGlo(pVecD2);           // momentum of D2 at the Tcc vertex
               trackParCovPi.getPxPyPzGlo(pVecSoftPi); // momentum of pi at the Tcc vertex

Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,7 @@ struct HfCandidateCreatorBplus {`
`326`	`326`	`}`
`327`	`327`	`hCandidatesB->Fill(SVFitting::FitOk);`
`328`	`328`
`329`		`- dfB.propagateTracksToVertex(); // propagate the bachelor and D0 to the B+ vertex`
	`329`	`+ // get D and Pi tracks (propagated to the B+ vertex if propagateToPCA==true)`
`330`	`330`	`trackD0.getPxPyPzGlo(pVecD0); // momentum of D0 at the B+ vertex`
`331`	`331`	`trackParCovPi.getPxPyPzGlo(pVecBach); // momentum of pi+ at the B+ vertex`
`332`	`332`