Catch NaN when FULLCOV fit fails

lsst · Oct 29, 2020 · 8758c92 · 8758c92
1 parent 16d947b
commit 8758c92
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/python/lsst/cp/pipe/astierCovPtcFit.py b/python/lsst/cp/pipe/astierCovPtcFit.py
@@ -602,8 +602,6 @@ def fitFullModel(self, pInit=None, nSigma=5.0, maxFitIter=3):
             if counter == maxFitIter:
                 break
 
-        if ierr not in [1, 2, 3, 4]:
-            raise RuntimeError("Minimization failed: " + mesg)
         self.covParams = paramsCov
 
         return params

diff --git a/python/lsst/cp/pipe/ptc.py b/python/lsst/cp/pipe/ptc.py
@@ -493,7 +493,8 @@ def getOutputPtcDataCovAstier(self, dataset, covFits, covFitsNoB):
             dataset.ptcFitPars[amp] = np.nan
             dataset.ptcFitParsError[amp] = np.nan
             dataset.ptcFitChiSq[amp] = np.nan
-            if amp in covFits:
+            if (amp in covFits and (covFits[amp].covParams is not None) and
+                    (covFitsNoB[amp].covParams is not None)):
                 fit = covFits[amp]
                 fitNoB = covFitsNoB[amp]
                 # Save full covariances, covariances models, and their weights