Changeset 25671

Timestamp:

Sep 29, 2009, 4:11:51 PM (17 years ago)

Author:

eugene

Message:

mask at large radius before trying to measure residual value; mask 1st as well as 0th order; mask a failed pixel fit rather than raising an error

File:

• branches/eam_branches/20090715/psphot/src/psphotMakeResiduals.c (modified) (3 diffs)

branches/eam_branches/20090715/psphot/src/psphotMakeResiduals.c

@@ -236 +236 @@
                 }
 
+                float radius = hypot((ox - 0.5*resid->Ro->numCols), (oy - 0.5*resid->Ro->numRows));
+                if (radius > radiusMax) {
+                  resid->mask->data.PM_TYPE_RESID_MASK_DATA[oy][ox] = 1;
+                  continue;
+                }
+
                 resid->Ro->data.F32[oy][ox] = psStatsGetValue(fluxStats, statOption);
                 resid->Rx->data.F32[oy][ox] = resid->Ry->data.F32[oy][ox] = 0.0;
@@ -250 +256 @@
                   resid->mask->data.PM_TYPE_RESID_MASK_DATA[oy][ox] = 1;
                 }
+            } else {
+                assert (SPATIAL_ORDER == 1);
 
                 float radius = hypot((ox - 0.5*resid->Ro->numCols), (oy - 0.5*resid->Ro->numRows));
                 if (radius > radiusMax) {
                   resid->mask->data.PM_TYPE_RESID_MASK_DATA[oy][ox] = 1;
-                }
-            } else {
-                assert (SPATIAL_ORDER == 1);
+                  continue;
+                }
+
                 psImageInit(A, 0.0);
                 psVectorInit(B, 0.0);
@@ -279 +287 @@
 
                 if (!psMatrixGJSolve(A, B)) {
-                    psError(PSPHOT_ERR_PSF, false, "Singular matrix solving for (y,x) = (%d,%d)'s residuals",
-                            oy, ox);
-                    psFree(resid); resid = NULL;
-                    break;
+                    resid->mask->data.PM_TYPE_RESID_MASK_DATA[oy][ox] = 1;
+                    psWarning("Singular matrix solving for (y,x) = (%d,%d)'s residuals, masking", oy, ox);
+                    continue;
                 }