Changeset 29216

Timestamp:

Sep 23, 2010, 7:04:57 AM (16 years ago)

Author:

eugene

Message:

replace pmReadoutMaskNonfinite with pmReadoutMaskInvalid (only masks unmasked nan pixels); call pmReadoutMaskInvalid before calling pmSubtractionMatchPrecalc (which now does not call pmSubtractionMaskInvalid)

Location:

branches/eam_branches/ipp-20100823/ppSub/src

Files:

• ppSubConvolve.c (modified) (1 diff)
• ppSubSetMasks.c (modified) (1 diff)

branches/eam_branches/ipp-20100823/ppSub/src/ppSubConvolve.c

@@ -241 +241 @@
             psThreadPoolInit(threads);
         }
+
+        // Mask the NAN values (USE BLANK instead of SAT?)
+        if (!pmReadoutMaskInvalid(input, maskVal, maskBad)) {
+          psError(PPSUB_ERR_DATA, false, "Unable to mask non-finite pixels in input.");
+          return false;
+        }
+        if (!pmReadoutMaskInvalid(ref, maskVal, maskBad)) {
+          psError(PPSUB_ERR_DATA, false, "Unable to mask non-finite pixels in reference.");
+          return false;
+        }
+
         if (!pmSubtractionMatchPrecalc(inConv, refConv, input, ref, inRO->analysis,
                                        stride, kernelErr, covarFrac, maskVal, maskBad, maskPoor,

branches/eam_branches/ipp-20100823/ppSub/src/ppSubSetMasks.c

@@ -77 +77 @@
     }
 
-    // Mask the NAN values
-    if (!pmReadoutMaskNonfinite(inRO, satValue)) {
+    // Mask the NAN values (USE BLANK instead of SAT?)
+    if (!pmReadoutMaskInvalid(inRO, maskValue, satValue)) {
         psError(PPSUB_ERR_DATA, false, "Unable to mask non-finite pixels in input.");
         return false;
     }
-    if (!pmReadoutMaskNonfinite(refRO, satValue)) {
+    if (!pmReadoutMaskInvalid(refRO, maskValue, satValue)) {
         psError(PPSUB_ERR_DATA, false, "Unable to mask non-finite pixels in reference.");
         return false;
     }
-
 
 #if 0