Changeset 26739 for branches/eam_branches/20091201/psModules/src/imcombine/pmSubtractionParams.c

Timestamp:

Jan 29, 2010, 6:02:38 PM (16 years ago)

Author:

Paul Price

Message:

Fairly extensive change to make subtractions more stable on images with limited lit area in the presence of spatial variation. Took the polynomials which were scaled over the entire image and scale them only over the lit area. Removed some fprintf statements. Fixed the problem causing the background term to always come out 1.0.

File:

• branches/eam_branches/20091201/psModules/src/imcombine/pmSubtractionParams.c (modified) (3 diffs)

branches/eam_branches/20091201/psModules/src/imcombine/pmSubtractionParams.c

@@ -204 +204 @@
                                                       int spatialOrder, const psVector *fwhms, int maxOrder,
                                                       const pmSubtractionStampList *stamps, int footprint,
-                                                      float tolerance, float penalty, pmSubtractionMode mode)
+                                                      float tolerance, float penalty, psRegion bounds,
+                                                      pmSubtractionMode mode)
 {
     if (type != PM_SUBTRACTION_KERNEL_ISIS && type != PM_SUBTRACTION_KERNEL_GUNK) {
@@ -232 +233 @@
     psVectorInit(orders, maxOrder);
     pmSubtractionKernels *kernels = p_pmSubtractionKernelsRawISIS(size, spatialOrder, fwhms, orders,
-                                                                  penalty, mode); // Kernels
+                                                                  penalty, bounds, mode); // Kernels
     psFree(orders);
     psFree(kernels->description);
@@ -483 +484 @@
     if (type == PM_SUBTRACTION_KERNEL_ISIS) {
 
-        // XXX in r26035, this code was just wrong.  we had:
-
-        // psKernel *subtract = kernels->preCalc->data[0]
-
-        // but, kernels->preCalc was an array of psArray, not an array of kernels.  It is now
-        // an array of pmSubtractionKernelPreCalc.
+        // XXX in r26035, this code was just wrong.  we had:
+
+        // psKernel *subtract = kernels->preCalc->data[0]
+
+        // but, kernels->preCalc was an array of psArray, not an array of kernels.  It is now
+        // an array of pmSubtractionKernelPreCalc.
 
         pmSubtractionKernelPreCalc *subtract = kernels->preCalc->data[0]; // Kernel to subtract from the rest