Changeset 23989 for trunk/psModules/src/imcombine

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

Location:

trunk/psModules/src/imcombine

Files:

• pmImageCombine.c (modified) (3 diffs)
• pmReadoutCombine.c (modified) (1 diff)
• pmSubtraction.c (modified) (1 diff)
• pmSubtractionMatch.c (modified) (1 diff)

trunk/psModules/src/imcombine/pmImageCombine.c

@@ -132 +132 @@
         // Combine all the pixels, using the specified stat.
         if (!psVectorStats(stats, pixelData, pixelErrors, pixelMasks, 0xff)) {
+            psError(PS_ERR_UNKNOWN, false, "failure to measure stats");
+            return false;
+        }
+        if (isnan(stats->sampleMean)) {
             combine->data.F32[y][x] = NAN;
             psFree(buffer);
@@ -137 +141 @@
         }
         float combinedPixel = stats->sampleMean; // Value of the combination
-
+        
         if (iter == 0) {
             // Save the value produced with no rejection, since it may be useful later
@@ -364 +368 @@
     // Get the median
     psStats *stats = psStatsAlloc(PS_STAT_SAMPLE_MEDIAN);
-    psVectorStats(stats, pixels, NULL, mask, 1);
+    if (!psVectorStats(stats, pixels, NULL, mask, 1)) {
+        psError(PS_ERR_UNKNOWN, false, "failure to measure stats");
+    }
     float median = stats->sampleMedian;
     psFree(stats);

trunk/psModules/src/imcombine/pmReadoutCombine.c

@@ -384 +384 @@
             // Combination
             if (!psVectorStats(stats, pixels, errors, mask, 1)) {
-                // Can't do much about it, but it's not worth worrying about
-                psErrorClear();
+                psError(PS_ERR_UNKNOWN, false, "error in pixel stats");
+                return false;
+            }
+            
+            outputImage[yOut][xOut] = psStatsGetValue(stats, params->combine);
+
+            if (isnan(outputImage[yOut][xOut])) {
                 outputImage[yOut][xOut] = NAN;
                 outputMask[yOut][xOut] = params->blank;
+                sigma->data.F32[yOut][xOut] = NAN;
                 if (params->variances) {
                     outputVariance[yOut][xOut] = NAN;
                 }
-                sigma->data.F32[yOut][xOut] = NAN;
-            } else {
-                outputImage[yOut][xOut] = psStatsGetValue(stats, params->combine);
-                outputMask[yOut][xOut] = isfinite(outputImage[yOut][xOut]) ? 0 : params->blank;
-                if (params->variances) {
-                    float stdev = psStatsGetValue(stats, combineStdev);
-                    outputVariance[yOut][xOut] = PS_SQR(stdev); // Variance
-                    // XXXX this is not the correct formal error.
-                    // also, the weighted mean is not obviously the correct thing here
-                }
-                sigma->data.F32[yOut][xOut] = psStatsGetValue(stats, combineStdev);
-            }
+                continue;
+            }
+            outputMask[yOut][xOut] = 0;
+            sigma->data.F32[yOut][xOut] = psStatsGetValue(stats, combineStdev);
+            if (params->variances) {
+                float stdev = psStatsGetValue(stats, combineStdev);
+                outputVariance[yOut][xOut] = PS_SQR(stdev); // Variance
+                // XXXX this is not the correct formal error.
+                // also, the weighted mean is not obviously the correct thing here
+            }
         }
     }

trunk/psModules/src/imcombine/pmSubtraction.c

@@ -822 +822 @@
     psFree(mask);
 
+    // XXX raise an error?
+    if (isnan(stats->sampleMean)) {
+        psFree(stats);
+        return -1;
+    }
+
     double mean, rms;                 // Mean and RMS of deviations
     if (numStamps < MIN_SAMPLE_STATS) {

trunk/psModules/src/imcombine/pmSubtractionMatch.c

@@ -830 +830 @@
     psFree(mask);
 
+    // XXX raise an error here or not?
+    if (isnan(stats->robustMedian)) {
+        psFree(stats);
+        return PM_SUBTRACTION_MODE_ERR;
+    }
+
     psLogMsg("psModules.imcombine", PS_LOG_INFO, "Median width ratio: %lf", stats->robustMedian);
     pmSubtractionMode mode = (stats->robustMedian <= 1.0 ? PM_SUBTRACTION_MODE_1 : PM_SUBTRACTION_MODE_2);
     psFree(stats);
 
-    // XXX EAM : I think Paul left some test code in here.  I've commented these lines out
-    // return PM_SUBTRACTION_MODE_2;
-    // exit(1);
-
     return mode;
 }