Changeset 19164 for trunk/psModules/src/imcombine/pmSubtractionStamps.c

Timestamp:

Aug 22, 2008, 12:45:36 PM (18 years ago)

Author:

Paul Price

Message:

Reworking the masking so as to avoid exploding the number of bad pixels in the convolved image. Introduced the bad/poor distinction. Bad pixels that are convolved now have a large 'poor' halo in the mask, with a smaller 'bad' halo. Got rid of the 'FOOTPRINT' mask value (internal subtraction mask): there's no need to convolve the mask in order to find out if a sprinkling of footprints are bad (not sure this is so efficient when a list of sources isn't supplied), and I needed the mask bits to signify the difference between 'bad' and 'poor'. Tested on a single subtraction, which seems to work.

File:

• trunk/psModules/src/imcombine/pmSubtractionStamps.c (modified) (5 diffs)

trunk/psModules/src/imcombine/pmSubtractionStamps.c

@@ -73 +73 @@
 static bool checkStampMask(int x, int y, // Coordinates of stamp
                            const psImage *mask, // Mask
-                           pmSubtractionMode mode // Mode for subtraction
+                           pmSubtractionMode mode, // Mode for subtraction
+                           int footprint // Footprint to check for Bad Stuff
                            )
 {
@@ -79 +80 @@
         return true;
     }
-    if (x < 0 || x >= mask->numCols || y < 0 || y >= mask->numRows) {
-        return false;
-    }
-
-    psMaskType maskVal = PM_SUBTRACTION_MASK_BORDER | PM_SUBTRACTION_MASK_REJ; // Mask value
+
+    bool clean = true;                  // Is the footprint clean?
+    int numCols = mask->numCols, numRows = mask->numRows; // Size of image
+
+    // Check the footprint bounds
+    if (x < footprint || x >= numCols - footprint || y < footprint || y >= numRows - footprint) {
+        clean = false;
+    }
+
+    // Determine mask value
+    psMaskType maskVal = PM_SUBTRACTION_MASK_BORDER | PM_SUBTRACTION_MASK_BAD_1 | PM_SUBTRACTION_MASK_BAD_2;
     switch (mode) {
       case PM_SUBTRACTION_MODE_1:
-        maskVal |= PM_SUBTRACTION_MASK_FOOTPRINT_1;
+        maskVal |= PM_SUBTRACTION_MASK_CONVOLVE_1;
         break;
       case PM_SUBTRACTION_MODE_2:
-        maskVal |= PM_SUBTRACTION_MASK_FOOTPRINT_2;
+        maskVal |= PM_SUBTRACTION_MASK_CONVOLVE_2;
         break;
       case PM_SUBTRACTION_MODE_UNSURE:
       case PM_SUBTRACTION_MODE_DUAL:
-        maskVal |= PM_SUBTRACTION_MASK_FOOTPRINT_1 | PM_SUBTRACTION_MASK_FOOTPRINT_2;
+        maskVal |= PM_SUBTRACTION_MASK_CONVOLVE_1 | PM_SUBTRACTION_MASK_CONVOLVE_2;
         break;
       default:
@@ -99 +106 @@
     }
 
-    return (mask->data.PS_TYPE_MASK_DATA[y][x] & maskVal) ? false : true;
+    // Check the immediate pixel
+    if (clean && (mask->data.PS_TYPE_MASK_DATA[y][x] & (maskVal | PM_SUBTRACTION_MASK_REJ))) {
+        clean = false;
+    }
+
+    int xMin = PS_MAX(x - footprint, 0), xMax = PS_MIN(x + footprint, numCols - 1); // Bounds in x
+    int yMin = PS_MAX(y - footprint, 0), yMax = PS_MIN(y + footprint, numRows - 1); // Bounds in y
+
+    // Check the footprint
+    if (clean) {
+        for (int j = yMin; j <= yMax; j++) {
+            for (int i = xMin; i <= xMax; i++) {
+                if (mask->data.PS_TYPE_MASK_DATA[j][i] & maskVal) {
+                    clean = false;
+                    goto CHECK_STAMP_MASK_DONE;
+                }
+            }
+        }
+    }
+CHECK_STAMP_MASK_DONE:
+
+    if (!clean) {
+        // Mask the footprint, so we don't select something near it again
+        for (int j = yMin; j <= yMax; j++) {
+            for (int i = xMin; i <= xMax; i++) {
+                mask->data.PS_TYPE_MASK_DATA[j][i] |= PM_SUBTRACTION_MASK_REJ;
+            }
+        }
+    }
+
+    return clean;
 }
 
@@ -259 +296 @@
             for (int y = subRegion->y0; y <= subRegion->y1; y++) {
                 for (int x = subRegion->x0; x <= subRegion->x1; x++) {
-                    if (checkStampMask(x, y, subMask, mode) && image->data.F32[y][x] > fluxStamp) {
+                    if (checkStampMask(x, y, subMask, mode, footprint) && image->data.F32[y][x] > fluxStamp) {
                         fluxStamp = image->data.F32[y][x];
                         xStamp = x;
@@ -353 +390 @@
             continue;
         }
-        if (!checkStampMask(xPix, yPix, subMask, mode)) {
+        if (!checkStampMask(xPix, yPix, subMask, mode, footprint)) {
             // Not a good stamp
             psTrace("psModules.imcombine", 9, "Rejecting input stamp (%d,%d) because bad mask",