Changeset 29060 for branches/sc_branches/trunkTest/ppSub/src/ppSubBackground.c

Timestamp:

Aug 26, 2010, 9:18:39 AM (16 years ago)

Author:

Serge CHASTEL

Message:

Merging trunk in branch

Location:

branches/sc_branches/trunkTest

Files:

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

branches/sc_branches/trunkTest/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;
         }
     }