Changeset 35938 for trunk/psModules

Timestamp:

Aug 13, 2013, 2:55:04 PM (13 years ago)

Author:

watersc1

Message:

Improved masking code in a way that I believe is correct.

File:

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

trunk/psModules/src/imcombine/pmSubtractionSimple.c

@@ -63 +63 @@
 }  
 
+bool simple_apply_mask(psImage *image, psImage *weight, psImage *mask,
+                       psImageMaskType maskVal) {
+  for (int y = 0; y < mask->numRows; y++) {
+    for (int x = 0; x < mask->numCols; x++) {
+      if (mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] & maskVal) {
+        image->data.F32[y][x] = NAN;
+        if (weight) {
+          weight->data.F32[y][x] = NAN;
+        }
+      }
+    }
+  }
+  return(true);
+}
+                       
+
 // Copied from pmSubtraction
 static void solvedKernelPreCalc(psKernel *kernel, // Kernel, updated
@@ -116 +132 @@
   psImage *varC2 = NULL;
 
+  psImage *maskTemp = NULL;
+  
   // Allocate images, as this is usually done by subtractionMatchAlloc after this function is called.  
   int numCols = ro1->image->numCols;
@@ -210 +228 @@
   int maskBox = (int) ceil(sigmaKern * 1.1774); // diameter is 1/2 FWHM
   int maskBlank = 8;  // I should be able to get this from a reference, right?
-
+  int maskPoorVal = 16384; // Another value that should be found elsewhere.
   //
   // Make a fake pmSubtractionKernels element so we can add it appropriately.
@@ -257 +275 @@
       psImageSmoothMask_Threaded(imageC1,image1,mask1,maskVal,sigmaKern,6,1e-6);
       psImageSmoothMask_Threaded(varC1,var1,mask1,maskVal,sigmaKern * M_SQRT1_2,6,1e-6);
-      maskC1 = psImageConvolveMask(maskC1,mask1,maskVal,maskBad,
+
+      maskTemp = psImageAlloc(numCols, numRows, PS_TYPE_IMAGE_MASK);
+      maskTemp = psImageConvolveMask(maskTemp,mask1,maskVal,maskBad,      // Mask bad values
                                    -maskBox,maskBox,-maskBox,maskBox);
+      maskC1 = psImageConvolveMask(maskC1,maskTemp,maskPoorVal,maskPoor,  // Mask poor values
+                                   -maskBox,maskBox,-maskBox,maskBox);
+      psFree(maskTemp);
+
       conv1->covariance = psImageCovarianceCalculate(kernel,ro1->covariance);
       pmSubtractionBorder(imageC1,varC1,maskC1,maskBox,maskBlank);
-      pmSubtractionMaskApply(imageC1,varC1,maskC1,PM_SUBTRACTION_MODE_1);
+      simple_apply_mask(imageC1,varC1,maskC1,maskBad);
     }
     if (conv2) {
@@ -274 +298 @@
       psImageSmoothMask_Threaded(imageC2,image2,mask2,maskVal,sigmaKern,6,1e-6);
       psImageSmoothMask_Threaded(varC2,var2,mask2,maskVal,sigmaKern * M_SQRT1_2,6,1e-6);
-      maskC2 = psImageConvolveMask(maskC2,mask2,maskVal,maskBad,
+
+      maskTemp = psImageAlloc(numCols, numRows, PS_TYPE_IMAGE_MASK);
+      maskTemp = psImageConvolveMask(maskTemp,mask2,maskVal,maskBad,      // Mask bad values
                                    -maskBox,maskBox,-maskBox,maskBox);
+      maskC2 = psImageConvolveMask(maskC2,maskTemp,maskPoorVal,maskPoor,  // Mask poor values
+                                   -maskBox,maskBox,-maskBox,maskBox);
+      psFree(maskTemp);
+
       conv2->covariance = psImageCovarianceCalculate(kernel,ro2->covariance);
       pmSubtractionBorder(imageC2,varC2,maskC2,maskBox,maskBlank);
-      pmSubtractionMaskApply(imageC2,varC2,maskC2,PM_SUBTRACTION_MODE_2);
+      simple_apply_mask(imageC2,varC2,maskC2,maskBad);
     }
     if (conv1) {