Changeset 15433 for trunk/psModules/src/imcombine/pmReadoutCombine.c

Timestamp:

Nov 1, 2007, 3:50:32 PM (19 years ago)

Author:

Paul Price

Message:

Ignore errors in psVectorStats.

File:

• trunk/psModules/src/imcombine/pmReadoutCombine.c (modified) (1 diff)

trunk/psModules/src/imcombine/pmReadoutCombine.c

@@ -315 +315 @@
             // Combination
             if (!psVectorStats(stats, pixels, errors, mask, 1)) {
-                psError(PS_ERR_UNKNOWN, false, "Error in statistics.");
-                psFree(index);
-                psFree(pixels);
-                psFree(mask);
-                psFree(weights);
-                psFree(errors);
-                psFree(stats);
-                psFree(invScale);
-                return false;
-            }
-
-            outputImage[yOut][xOut] = psStatsGetValue(stats, params->combine);
-            if (!isfinite(outputImage[yOut][xOut])) {
+                // Can't do much about it, but it's not worth worrying about
+                psErrorClear();
+                outputImage[yOut][xOut] = NAN;
                 outputMask[yOut][xOut] = params->blank;
-            }
-            if (params->weights) {
-                float stdev = psStatsGetValue(stats, combineStdev);
-                outputWeight[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
+                if (params->weights) {
+                    outputWeight[yOut][xOut] = NAN;
+                }
+            } else {
+                outputImage[yOut][xOut] = psStatsGetValue(stats, params->combine);
+                if (!isfinite(outputImage[yOut][xOut])) {
+                    outputMask[yOut][xOut] = params->blank;
+                }
+                if (params->weights) {
+                    float stdev = psStatsGetValue(stats, combineStdev);
+                    outputWeight[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
+                }
             }
         }