Merge branch 'bugfix/remove-pvalue-cut-r08-02' into 'release/08-03'

GiacomoXT · GiacomoXT · commit ddcba7343f57 · 2025-02-28T05:02:02.000+01:00
Merge branch 'bugfix/remove-pvalue-cut-r08-02' into 'main'

See merge request belle2/software/basf2!4159
diff --git a/genfit2/code2/fitters/src/DAF.cc b/genfit2/code2/fitters/src/DAF.cc
@@ -151,7 +151,7 @@ namespace genfit {
       try {
         converged = calcWeights(tr, rep, betas_.at(iBeta));
         if (!converged && iBeta >= minIterForPval_ - 1 &&
-            status->getBackwardPVal() > 1e-10 && lastPval > 1e-10 && fabs(lastPval - status->getBackwardPVal()) < this->deltaPval_) {
+            status->getBackwardPVal() != 0 && fabs(lastPval - status->getBackwardPVal()) < this->deltaPval_) {
           if (debugLvl_ > 0) {
             debugOut << "converged by Pval = " << status->getBackwardPVal() << " even though weights changed at iBeta = " << iBeta << std::endl;
           }

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ namespace genfit {`
`151`	`151`	`try {`
`152`	`152`	`converged = calcWeights(tr, rep, betas_.at(iBeta));`
`153`	`153`	`if (!converged && iBeta >= minIterForPval_ - 1 &&`
`154`		`- status->getBackwardPVal() > 1e-10 && lastPval > 1e-10 && fabs(lastPval - status->getBackwardPVal()) < this->deltaPval_) {`
	`154`	`+ status->getBackwardPVal() != 0 && fabs(lastPval - status->getBackwardPVal()) < this->deltaPval_) {`
`155`	`155`	`if (debugLvl_ > 0) {`
`156`	`156`	`debugOut << "converged by Pval = " << status->getBackwardPVal() << " even though weights changed at iBeta = " << iBeta << std::endl;`
`157`	`157`	`}`