Changeset 18287 for trunk/psModules/src/imcombine/pmSubtractionParams.c

Timestamp:

Jun 23, 2008, 12:41:08 PM (18 years ago)

Author:

Paul Price

Message:

Merging in dual-convolution development branch.

File:

• trunk/psModules/src/imcombine/pmSubtractionParams.c (modified) (2 diffs)

trunk/psModules/src/imcombine/pmSubtractionParams.c

@@ -204 +204 @@
                                                       int spatialOrder, const psVector *fwhms, int maxOrder,
                                                       const pmSubtractionStampList *stamps, int footprint,
-                                                      float tolerance, pmSubtractionMode mode)
+                                                      float tolerance, float penalty, pmSubtractionMode mode)
 {
     if (type != PM_SUBTRACTION_KERNEL_ISIS && type != PM_SUBTRACTION_KERNEL_GUNK) {
@@ -231 +231 @@
     psVector *orders = psVectorAlloc(numGaussians, PS_TYPE_S32); // Polynomial orders
     psVectorInit(orders, maxOrder);
-    pmSubtractionKernels *kernels = p_pmSubtractionKernelsRawISIS(size, spatialOrder,
-                                                                  fwhms, orders, mode); // Kernels
+    pmSubtractionKernels *kernels = p_pmSubtractionKernelsRawISIS(size, spatialOrder, fwhms, orders,
+                                                                  penalty, mode); // Kernels
     psFree(orders);
     psFree(kernels->description);