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

Timestamp:

Dec 6, 2007, 3:57:15 PM (18 years ago)

Author:

Paul Price

Message:

Implementing dual-convolution. This required reworking those
functions involved with calculating and solving the equations; moved
these into a separate file and made various other cleanups (e.g.,
assertions for pmSubtractionKernels). Removed the normalisation
(central pixel) term from all kernels, because this shouldn't be in
the second kernel (there's only one normalisation term between the two
kernels); the normalisation is treated explicitly in the equations,
along with the background (still only a constant background is
supported for now, but there's a lot of support for a polynomial
background for when I get around to putting it in the equations).
Tested the single convolution, and it's working; same results as
before, apparently. Haven't tested dual convolution yet.

File:

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

trunk/psModules/src/imcombine/pmSubtractionParams.c

@@ -232 +232 @@
     psVectorInit(orders, maxOrder);
     pmSubtractionKernels *kernels = p_pmSubtractionKernelsRawISIS(size, spatialOrder,
-                                                                  fwhms, orders); // Kernels
+                                                                  fwhms, orders, mode); // Kernels
     psFree(orders);
     psFree(kernels->description);
@@ -279 +279 @@
             continue;
         }
-        if (!pmSubtractionConvolveStamp(stamp, kernels, footprint, mode)) {
+        if (!pmSubtractionConvolveStamp(stamp, kernels, footprint)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to convolve stamp %d.", i);
             psFree(targets);
@@ -505 +505 @@
 
         kernels->type = PM_SUBTRACTION_KERNEL_GUNK;
-
-        kernels->subIndex = PS_SQR(2 * inner + 1) / 2 + numGaussians;
-        assert(kernels->u->data.S32[kernels->subIndex] == 0 &&
-               kernels->v->data.S32[kernels->subIndex] == 0);
     }