Changeset 14355

Timestamp:

Jul 20, 2007, 3:09:05 PM (19 years ago)

Author:

Paul Price

Message:

Don't need to do calculations if the mask says it's bad. Check for bad values coming out of psStats.

File:

• trunk/psModules/src/imcombine/pmReadoutCombine.c (modified) (3 diffs)

trunk/psModules/src/imcombine/pmReadoutCombine.c

@@ -254 +254 @@
                 }
 
+                // Check mask
+                psImage *roMask = readout->mask; // The mask image
+                if (roMask && roMask->data.U8[yIn][xIn] & maskVal) {
+                    maskData[r] = 1;
+                    continue;
+                }
+
                 if (params->weights) {
                     weightsData[r] = readout->weight->data.F32[yIn][xIn];
@@ -266 +273 @@
                         weightsData[r] *= invScale->data.F32[r] * invScale->data.F32[r];
                     }
-                }
-
-                // Check mask
-                psImage *roMask = readout->mask; // The mask image
-                if (roMask && roMask->data.U8[yIn][xIn] & maskVal) {
-                    maskData[r] = 1;
-                    continue;
                 }
 
@@ -327 +327 @@
 
             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);