Changeset 29003 for trunk/ppSub/src/ppSubBackground.c

Timestamp:

Aug 20, 2010, 12:12:38 PM (16 years ago)

Author:

eugene

Message:

ensure masked pixels are NAN in output; flag detections with bright pos image neighbors

File:

• trunk/ppSub/src/ppSubBackground.c (modified) (1 diff)

trunk/ppSub/src/ppSubBackground.c

@@ -67 +67 @@
     for (int y = 0; y < numRows; y++) {
         for (int x = 0; x < numCols; x++) {
+            // special case 1: NAN the masked pixels
             if (mask && mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] & maskBad) {
-                image->data.F32[y][x] = 0.0;
-            } else {
-                float value = psImageUnbinPixel(x + 0.5, y + 0.5, modelImage, binning); // Background value
-                if (!isfinite(value)) {
-                    image->data.F32[y][x] = NAN;
-                    mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] |= maskBad;
-                } else {
-                    image->data.F32[y][x] -= value;
-                }
-            }
+                image->data.F32[y][x] = NAN;
+                continue;
+            } 
+            // special case 1: NAN & mask pixels without a valid background model
+            float value = psImageUnbinPixel(x + 0.5, y + 0.5, modelImage, binning); // Background value
+            if (!isfinite(value)) {
+              image->data.F32[y][x] = NAN;
+              mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] |= maskBad;
+              continue;
+            } 
+            image->data.F32[y][x] -= value;
         }
     }