Changeset 15756 for trunk/psModules/src/imcombine/pmSubtractionStamps.h

Timestamp:

Dec 6, 2007, 3:57:15 PM (19 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/pmSubtractionStamps.h (modified) (9 diffs)

trunk/psModules/src/imcombine/pmSubtractionStamps.h

@@ -23 +23 @@
     psArray *x, *y;                     ///< Coordinates for possible stamps (or NULL)
     psArray *flux;                      ///< Fluxes for possible stamps (or NULL)
+    int footprint;                      ///< Half-size of stamps
 } pmSubtractionStampList;
 
@@ -29 +30 @@
                                                     int numRows, // Number of rows in image
                                                     const psRegion *region, // Region for stamps, or NULL
+                                                    int footprint, // Half-size of stamps
                                                     float spacing // Rough average spacing between stamps
     );
@@ -40 +42 @@
     PS_ASSERT_ARRAY_SIZE((LIST)->stamps, (LIST)->num, RETURNVALUE); \
     PS_ASSERT_ARRAY_SIZE((LIST)->regions, (LIST)->num, RETURNVALUE); \
+    PS_ASSERT_INT_NONNEGATIVE((LIST)->footprint, RETURNVALUE); \
     if ((LIST)->x || (LIST)->y || (LIST)->flux) { \
         PS_ASSERT_ARRAY_NON_NULL((LIST)->x, RETURNVALUE); \
@@ -57 +60 @@
     psKernel *image1;                   ///< Reference image postage stamp
     psKernel *image2;                   ///< Input image postage stamp
-    psKernel *weight;                   ///< Weight image postage stamp
-    psArray *convolutions1;             ///< Convolutions of image 1 for each kernel component
-    psArray *convolutions2;             ///< Convolutions of image 2 for each kernel component
-    psImage *matrix;                    ///< Associated matrix
-    psVector *vector;                   ///< Assoicated vector
+    psKernel *weight;                   ///< Weight image postage stamp, or NULL
+    psArray *convolutions1;             ///< Convolutions of image 1 for each kernel component, or NULL
+    psArray *convolutions2;             ///< Convolutions of image 2 for each kernel component, or NULL
+    psImage *matrix1, *matrix2;         ///< Matrices for each image, or NULL
+    psImage *matrixX;                   ///< Cross-matrix (for mode DUAL), or NULL
+    psVector *vector;                   ///< Associated vector (when mode not DUAL), or NULL
     pmSubtractionStampStatus status;    ///< Status of stamp
 } pmSubtractionStamp;
@@ -74 +78 @@
                                                 const psRegion *region, ///< Region to search, or NULL
                                                 float threshold, ///< Threshold for stamps in the image
+                                                int footprint, ///< Half-size for stamps
                                                 float spacing, ///< Rough spacing for stamps
                                                 pmSubtractionMode mode ///< Mode for subtraction
@@ -85 +90 @@
                                                const psImage *mask, ///< Mask, or NULL
                                                const psRegion *region, ///< Region to search, or NULL
+                                               int footprint, ///< Half-size for stamps
                                                float spacing, ///< Rough spacing for stamps
                                                pmSubtractionMode mode ///< Mode for subtraction
@@ -94 +100 @@
     const psImage *subMask,             ///< Mask, or NULL
     const psRegion *region,             ///< Region to search, or NULL
+    int footprint,                      ///< Half-size for stamps
     float spacing,                      ///< Rough spacing for stamps
     pmSubtractionMode mode              ///< Mode for subtraction
@@ -103 +110 @@
     const psImage *subMask,             ///< Mask, or NULL
     const psRegion *region,             ///< Region to search, or NULL
+    int footprint,                      ///< Half-size for stamps
     float spacing,                      ///< Rough spacing for stamps
     pmSubtractionMode mode              ///< Mode for subtraction
@@ -109 +117 @@
 /// Extract stamps from the images
 bool pmSubtractionStampsExtract(pmSubtractionStampList *stamps, ///< Stamps
-                                psImage *reference, ///< Reference image
-                                psImage *input, ///< Input image (or NULL)
+                                psImage *image1, ///< Reference image
+                                psImage *image2, ///< Input image (or NULL)
                                 psImage *weight, ///< Weight (variance) map
-                                int footprint, ///< Stamp footprint size
                                 int kernelSize ///< Kernel half-size
     );