Fix condition to disable V0/Cascade hypothesis in the SVertexer + other minor fix (#14324)

shahor02 · web-flow · commit f9c073b2ad4a · 2025-05-23T17:52:13.000+02:00
* Fix condition to disable V0/Cascade hypothesis in the SVertexer

* Fix some rejection status assignments
diff --git a/Common/DCAFitter/include/DCAFitter/DCAFitterN.h b/Common/DCAFitter/include/DCAFitter/DCAFitterN.h
@@ -142,6 +142,8 @@ class DCAFitterN
     FailInv2ndDeriv, // inversion of 2nd derivatives failed
     FailCorrTracks,  // correction of tracks to updated x failed
     FailCloserAlt,   // alternative PCA is closer
+    //
+    NStatusesDefined
   };
 
   static constexpr int getNProngs() { return N; }
@@ -989,7 +991,7 @@ GPUd() bool DCAFitterN<N, Args...>::minimizeChi2()
   }
 
   if (mMaxDZIni > 0 && !roughDZCut()) { // apply rough cut on tracks Z difference
-    mFitStatus[mCurHyp] = FitStatus::RejTrackX;
+    mFitStatus[mCurHyp] = FitStatus::RejTrackRoughZ;
     return false;
   }
 
@@ -1063,7 +1065,7 @@ GPUd() bool DCAFitterN<N, Args...>::minimizeChi2NoErr()
     setTrackPos(mTrPos[mCurHyp][i], mCandTr[mCurHyp][i]); // prepare positions
   }
   if (mMaxDZIni > 0 && !roughDZCut()) { // apply rough cut on tracks Z difference
-    mFitStatus[mCurHyp] = FitStatus::RejTrackX;
+    mFitStatus[mCurHyp] = FitStatus::RejTrackRoughZ;
     return false;
   }
 
diff --git a/Detectors/Vertexing/include/DetectorsVertexing/SVertexHypothesis.h b/Detectors/Vertexing/include/DetectorsVertexing/SVertexHypothesis.h
@@ -60,7 +60,7 @@ class SVertexHypothesis
 
   bool check(float p2Pos, float p2Neg, float p2V0, float ptV0) const
   { // check if given mass and pt is matching to hypothesis
-    return mPars[SigmaM] > 0 && check(calcMass(p2Pos, p2Neg, p2V0), ptV0);
+    return mPars[SigmaM] >= 0.f && check(calcMass(p2Pos, p2Neg, p2V0), ptV0);
   }
   bool check(float mass, float pt) const
   { // check if given mass and pt is matching to hypothesis
@@ -151,7 +151,7 @@ class SVertex3Hypothesis
 
   bool check(float p2Pos, float p2Neg, float p2Bach, float p2Tot, float ptV0) const
   { // check if given mass and pt is matching to hypothesis
-    return mPars[SigmaM] > 0 && check(calcMass(p2Pos, p2Neg, p2Bach, p2Tot), ptV0);
+    return mPars[SigmaM] >= 0.f && check(calcMass(p2Pos, p2Neg, p2Bach, p2Tot), ptV0);
   }
 
   bool check(float mass, float pt) const

Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,8 @@ class DCAFitterN`
`142`	`142`	`FailInv2ndDeriv, // inversion of 2nd derivatives failed`
`143`	`143`	`FailCorrTracks, // correction of tracks to updated x failed`
`144`	`144`	`FailCloserAlt, // alternative PCA is closer`
	`145`	`+ //`
	`146`	`+ NStatusesDefined`
`145`	`147`	`};`
`146`	`148`
`147`	`149`	`static constexpr int getNProngs() { return N; }`
`@@ -989,7 +991,7 @@ GPUd() bool DCAFitterN<N, Args...>::minimizeChi2()`
`989`	`991`	`}`
`990`	`992`
`991`	`993`	`if (mMaxDZIni > 0 && !roughDZCut()) { // apply rough cut on tracks Z difference`
`992`		`- mFitStatus[mCurHyp] = FitStatus::RejTrackX;`
	`994`	`+ mFitStatus[mCurHyp] = FitStatus::RejTrackRoughZ;`
`993`	`995`	`return false;`
`994`	`996`	`}`
`995`	`997`
`@@ -1063,7 +1065,7 @@ GPUd() bool DCAFitterN<N, Args...>::minimizeChi2NoErr()`
`1063`	`1065`	`setTrackPos(mTrPos[mCurHyp][i], mCandTr[mCurHyp][i]); // prepare positions`
`1064`	`1066`	`}`
`1065`	`1067`	`if (mMaxDZIni > 0 && !roughDZCut()) { // apply rough cut on tracks Z difference`
`1066`		`- mFitStatus[mCurHyp] = FitStatus::RejTrackX;`
	`1068`	`+ mFitStatus[mCurHyp] = FitStatus::RejTrackRoughZ;`
`1067`	`1069`	`return false;`
`1068`	`1070`	`}`
`1069`	`1071`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ class SVertexHypothesis`
`60`	`60`
`61`	`61`	`bool check(float p2Pos, float p2Neg, float p2V0, float ptV0) const`
`62`	`62`	`{ // check if given mass and pt is matching to hypothesis`
`63`		`- return mPars[SigmaM] > 0 && check(calcMass(p2Pos, p2Neg, p2V0), ptV0);`
	`63`	`+ return mPars[SigmaM] >= 0.f && check(calcMass(p2Pos, p2Neg, p2V0), ptV0);`
`64`	`64`	`}`
`65`	`65`	`bool check(float mass, float pt) const`
`66`	`66`	`{ // check if given mass and pt is matching to hypothesis`
`@@ -151,7 +151,7 @@ class SVertex3Hypothesis`
`151`	`151`
`152`	`152`	`bool check(float p2Pos, float p2Neg, float p2Bach, float p2Tot, float ptV0) const`
`153`	`153`	`{ // check if given mass and pt is matching to hypothesis`
`154`		`- return mPars[SigmaM] > 0 && check(calcMass(p2Pos, p2Neg, p2Bach, p2Tot), ptV0);`
	`154`	`+ return mPars[SigmaM] >= 0.f && check(calcMass(p2Pos, p2Neg, p2Bach, p2Tot), ptV0);`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`bool check(float mass, float pt) const`