Changeset 19164 for trunk/psModules/src/imcombine/pmSubtractionMask.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/pmSubtractionMask.c (modified) (2 diffs)

trunk/psModules/src/imcombine/pmSubtractionMask.c

@@ -138 +138 @@
 
     if (!psImageConvolveMask(mask, mask, PM_SUBTRACTION_MASK_BAD_1,
-                             PM_SUBTRACTION_MASK_CONVOLVE_1 | PM_SUBTRACTION_MASK_FOOTPRINT_1,
+                             PM_SUBTRACTION_MASK_CONVOLVE_1,
                              -size, size, -size, size)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to convolve bad pixels from mask 1.");
@@ -145 +145 @@
     }
     if (!psImageConvolveMask(mask, mask, PM_SUBTRACTION_MASK_BAD_2,
-                             PM_SUBTRACTION_MASK_CONVOLVE_2 | PM_SUBTRACTION_MASK_FOOTPRINT_2,
+                             PM_SUBTRACTION_MASK_CONVOLVE_2,
                              -size, size, -size, size)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to convolve bad pixels from mask 2.");
-        psFree(mask);
-        return NULL;
-    }
-    if (!psImageConvolveMask(mask, mask, PM_SUBTRACTION_MASK_CONVOLVE_1,
-                             PM_SUBTRACTION_MASK_FOOTPRINT_1,
-                             -footprint, footprint, -footprint, footprint)) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to reconvolve bad pixels from mask 1.");
-        psFree(mask);
-        return NULL;
-    }
-    if (!psImageConvolveMask(mask, mask, PM_SUBTRACTION_MASK_CONVOLVE_2,
-                             PM_SUBTRACTION_MASK_FOOTPRINT_2,
-                             -footprint, footprint, -footprint, footprint)) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to reconvolve bad pixels from mask 2.");
         psFree(mask);
         return NULL;