Changeset 23989 for trunk/psphot/src/psphotMakeResiduals.c

Timestamp:

Apr 28, 2009, 11:21:56 AM (17 years ago)

Author:

eugene

Message:

always handle psVectorStats false return status (is an error); check for NAN results and handle as possible

File:

• trunk/psphot/src/psphotMakeResiduals.c (modified) (2 diffs)

trunk/psphot/src/psphotMakeResiduals.c

@@ -200 +200 @@
             // measure the robust median to determine a baseline reference value
             *fluxClip = *fluxClipDef;
-            psVectorStats (fluxClip, fluxes, NULL, fmasks, fmaskVal);
-            psErrorClear();             // clear (ignore) any outstanding errors
+            if (!psVectorStats (fluxClip, fluxes, NULL, fmasks, fmaskVal)) {
+                psError(PSPHOT_ERR_CONFIG, false, "Error calculating residual stats");
+                return false;
+            }
+            if (isnan(fluxClip->robustMedian)) {
+                resid->Ro->data.F32[oy][ox] = 0.0;
+                resid->Rx->data.F32[oy][ox] = 0.0;
+                resid->Ry->data.F32[oy][ox] = 0.0;
+                resid->mask->data.PM_TYPE_RESID_MASK_DATA[oy][ox] = badMask;
+                continue;
+            }
 
             // mark input pixels which are more than N sigma from the median
@@ -220 +229 @@
                 // measure the desired statistic on the unclipped pixels
                 *fluxStats = *fluxStatsDef;
-                psVectorStats (fluxStats, fluxes, NULL, fmasks, fmaskVal);
-                psErrorClear();         // clear (ignore) any outstanding errors
+                if (!psVectorStats (fluxStats, fluxes, NULL, fmasks, fmaskVal)) {
+                    psError(PSPHOT_ERR_CONFIG, false, "Error calculating residual stats");
+                    return false;
+                }
 
                 resid->Ro->data.F32[oy][ox] = psStatsGetValue(fluxStats, statOption);
                 resid->Rx->data.F32[oy][ox] = resid->Ry->data.F32[oy][ox] = 0.0;
-                //resid->variance->data.F32[oy][ox] = fluxStats->sampleStdev;
+
+                if (isnan(resid->Ro->data.F32[oy][ox])) {
+                    resid->Ro->data.F32[oy][ox] = 0.0;
+                    resid->Rx->data.F32[oy][ox] = 0.0;
+                    resid->Ry->data.F32[oy][ox] = 0.0;
+                    resid->mask->data.PM_TYPE_RESID_MASK_DATA[oy][ox] = badMask;
+                    continue;
+                }
 
                 if (fabs(resid->Ro->data.F32[oy][ox]) < pixelSN*fluxStats->sampleStdev/sqrt(nKeep)) {