Changeset 18248 for branches/pap_branch_080617/psModules/src/imcombine/pmSubtractionMatch.c

Timestamp:

Jun 20, 2008, 3:27:33 PM (18 years ago)

Author:

Paul Price

Message:

Dual convolution seems to be working. Removed division by 'weight' when generating equation --- seems to bias the fits.

File:

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

branches/pap_branch_080617/psModules/src/imcombine/pmSubtractionMatch.c

@@ -97 +97 @@
                         pmSubtractionKernelsType type, int size, int spatialOrder,
                         const psVector *isisWidths, const psVector *isisOrders,
-                        int inner, int ringsOrder, int binning, bool optimum, const psVector *optFWHMs,
-                        int optOrder, float optThreshold, int iter, float rej, psMaskType maskBad,
-                        psMaskType maskBlank, float badFrac, pmSubtractionMode mode)
+                        int inner, int ringsOrder, int binning, float penalty,
+                        bool optimum, const psVector *optFWHMs, int optOrder, float optThreshold,
+                        int iter, float rej, psMaskType maskBad, psMaskType maskBlank,
+                        float badFrac, pmSubtractionMode mode)
 {
     if (mode != PM_SUBTRACTION_MODE_2) {
@@ -300 +301 @@
             if (optimum && (type == PM_SUBTRACTION_KERNEL_ISIS || type == PM_SUBTRACTION_KERNEL_GUNK)) {
                 kernels = pmSubtractionKernelsOptimumISIS(type, size, inner, spatialOrder, optFWHMs, optOrder,
-                                                          stamps, footprint, optThreshold, mode);
+                                                          stamps, footprint, optThreshold, penalty, mode);
                 if (!kernels) {
                     psErrorClear();
@@ -309 +310 @@
                 // Not an ISIS/GUNK kernel, or the optimum kernel search failed
                 kernels = pmSubtractionKernelsGenerate(type, size, spatialOrder, isisWidths, isisOrders,
-                                                       inner, binning, ringsOrder, mode);
+                                                       inner, binning, ringsOrder, penalty, mode);
             }