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

Timestamp:

Oct 31, 2008, 5:36:01 PM (18 years ago)

Author:

Paul Price

Message:

Making relative systematic error in kernel a configurable parameter instead of #define.

File:

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

trunk/psModules/src/imcombine/pmSubtractionMatch.c

@@ -98 +98 @@
                         int inner, int ringsOrder, int binning, float penalty,
                         bool optimum, const psVector *optFWHMs, int optOrder, float optThreshold,
-                        int iter, float rej, psMaskType maskVal, psMaskType maskBad, psMaskType maskPoor,
-                        float poorFrac, float badFrac, pmSubtractionMode subMode)
+                        int iter, float rej, float sysError, psMaskType maskVal, psMaskType maskBad,
+                        psMaskType maskPoor, float poorFrac, float badFrac, pmSubtractionMode subMode)
 {
     if (subMode != PM_SUBTRACTION_MODE_2) {
@@ -167 +167 @@
     PS_ASSERT_INT_POSITIVE(iter, false);
     PS_ASSERT_FLOAT_LARGER_THAN(rej, 0.0, false);
+    if (isfinite(sysError)) {
+        PS_ASSERT_FLOAT_LARGER_THAN_OR_EQUAL(sysError, 0.0, NULL);
+        PS_ASSERT_FLOAT_LESS_THAN(sysError, 1.0, NULL);
+    }
     // Don't care about maskVal
     // Don't care about maskBad
@@ -393 +397 @@
             psTrace("psModules.imcombine", 2, "Convolving...\n");
             if (!pmSubtractionConvolve(conv1, conv2, ro1, ro2, subMask, maskBad, maskPoor, poorFrac,
-                                       region, kernels, true, useFFT)) {
+                                       sysError, region, kernels, true, useFFT)) {
                 psError(PS_ERR_UNKNOWN, false, "Unable to convolve image.");
                 goto MATCH_ERROR;