Changeset 15305 for trunk/psModules/src/imcombine/pmSubtractionMatch.c

Timestamp:

Oct 12, 2007, 1:00:37 PM (19 years ago)

Author:

Paul Price

Message:

Will fail without trying hard if there are not enough good pixels.

File:

• trunk/psModules/src/imcombine/pmSubtractionMatch.c (modified) (3 diffs)

trunk/psModules/src/imcombine/pmSubtractionMatch.c

@@ -98 +98 @@
                         int inner, int ringsOrder, int binning, bool optimum, const psVector *optFWHMs,
                         int optOrder, float optThreshold, int iter, float rej, psMaskType maskBad,
-                        psMaskType maskBlank)
+                        psMaskType maskBlank, float badFrac)
 {
     PS_ASSERT_PTR_NON_NULL(convolved, false);
@@ -165 +165 @@
     // Don't care about maskBad
     // Don't care about maskBlank
+    if (isfinite(badFrac)) {
+        PS_ASSERT_FLOAT_LARGER_THAN(badFrac, 0.0, NULL);
+        PS_ASSERT_FLOAT_LESS_THAN_OR_EQUAL(badFrac, 1.0, NULL);
+    }
 
     // If the stamp footprint is smaller than the kernel size, then we won't get much signal in the outer
@@ -219 +223 @@
     memCheck("start");
 
-    subMask = pmSubtractionMask(reference->mask, inMask, maskBad, size, footprint);
+    subMask = pmSubtractionMask(reference->mask, inMask, maskBad, size, footprint, badFrac);
+    if (subMask) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to generate subtraction mask.");
+        return false;
+    }
 
     memCheck("mask");