Add break to outlier rejection iterations if mask is unchanged.

lsst · May 17, 2023 · 1f8ca46 · 1f8ca46
1 parent 161a02f
commit 1f8ca46
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/python/lsst/cp/pipe/ptc/cpSolvePtcTask.py b/python/lsst/cp/pipe/ptc/cpSolvePtcTask.py
@@ -1022,6 +1022,7 @@ def errFunc(p, x, y):
                 newMask = (mask & (meanVecOriginal <= self.config.maxSignalInitialPtcOutlierFit))
 
                 count = 0
+                lastMask = mask.copy()
                 while count < maxIterationsPtcOutliers:
                     res = least_squares(
                         errFunc,
@@ -1055,6 +1056,13 @@ def errFunc(p, x, y):
                         ampName,
                     )
 
+                    # If the mask hasn't changed then break out.
+                    if np.all(newMask == lastMask):
+                        self.log.debug("Convergence at iteration %d; breaking loop for %s.", count, ampName)
+                        break
+
+                    lastMask = newMask.copy()
+
                     count += 1
 
             # Set the mask to the new mask