Changeset 14671 for trunk/psModules/src/imcombine/pmSubtractionStamps.c

Timestamp:

Aug 27, 2007, 10:55:23 AM (19 years ago)

Author:

Paul Price

Message:

Adding function pmSubtractionKernelsOptimumISIS, which derives an optimum set of kernels for ISIS (and GUNK). Its use necessitated a few API changes to the other parts of the image subtraction.

File:

• trunk/psModules/src/imcombine/pmSubtractionStamps.c (modified) (4 diffs)

trunk/psModules/src/imcombine/pmSubtractionStamps.c

@@ -239 +239 @@
 
 bool pmSubtractionExtractStamps(psArray *stamps, psImage *reference, psImage *input, psImage *weight,
-                                int footprint, const pmSubtractionKernels *kernels)
+                                int footprint, int kernelSize)
 {
     PS_ASSERT_ARRAY_NON_NULL(stamps, false);
@@ -254 +254 @@
         PS_ASSERT_IMAGE_TYPE(weight, PS_TYPE_F32, false);
     }
+    PS_ASSERT_INT_NONNEGATIVE(footprint, false);
+    PS_ASSERT_INT_NONNEGATIVE(kernelSize, false);
 
     int numCols = reference->numCols, numRows = reference->numRows; // Size of images
-    int size = kernels->size + footprint; // Size of postage stamps
+    int size = kernelSize + footprint; // Size of postage stamps
 
     if (!weight) {
@@ -303 +305 @@
 
 
-bool pmSubtractionGenerateStamps(psArray *stamps, float fwhm, int footprint,
-                                 const pmSubtractionKernels *kernels)
+bool pmSubtractionGenerateStamps(psArray *stamps, float fwhm, int footprint, int kernelSize)
 {
     PS_ASSERT_ARRAY_NON_NULL(stamps, false);
@@ -310 +311 @@
     PS_ASSERT_INT_NONNEGATIVE(footprint, false);
 
-    int size = kernels->size + footprint; // Size of postage stamps
+    int size = kernelSize + footprint; // Size of postage stamps
     int num = stamps->n;                // Number of stamps
     float sigma = fwhm / (2.0 * sqrtf(2.0 * log(2.0))); // Gaussian sigma