Changeset 15443 for trunk/psModules/src/imcombine/pmSubtractionMatch.h

Timestamp:

Nov 2, 2007, 4:28:24 PM (19 years ago)

Author:

Paul Price

Message:

Adding function pmSubtractionOrder (choice of name is probably not the best) to determine which of the two images under consideration should be convolved to match the other. Originally was doing this by solving for a RING kernel of width 1, going both ways, and comparing the deviations for each. However, when doing stacks this didn't work (convolving the wider fake Gaussian image gave smaller deviations than convolving the narrower input image), so have settled on measuring the second moments for each stamp, and using the ratio of moments between the two images to determine which is wider; this seems to work for both subtracting and stacking images. In the process, plugged a few memory leaks, and added code to support convolving either way (or both ways; this will be useful when it comes time to code the dual convolution algorithm).

File:

• trunk/psModules/src/imcombine/pmSubtractionMatch.h (modified) (3 diffs)

trunk/psModules/src/imcombine/pmSubtractionMatch.h

@@ -4 +4 @@
 #include <pslib.h>
 
-#include "pmHDU.h"
-#include "pmFPA.h"
-#include "pmSubtractionKernels.h"
+#include <pmHDU.h>
+#include <pmFPA.h>
+#include <pmSubtractionKernels.h>
+#include <pmSubtractionStamps.h>
 
-
+/// Match two images
 bool pmSubtractionMatch(pmReadout *convolved, ///< Output convolved data
-                        const pmReadout *reference, ///< Reference data
-                        const pmReadout *input, ///< Input data
+                        const pmReadout *ro1, ///< Image 1
+                        const pmReadout *ro2, ///< Image 2
                         // Stamp parameters
                         int footprint,  ///< Stamp half-size
@@ -19 +20 @@
                         const psArray *sources, ///< Sources for stamps
                         const char *stampsName, ///< Filename for stamps
-                        float targetWidth, ///< Width of PSF for simulated target
                         // Kernel parameters
                         pmSubtractionKernelsType type, ///< Kernel type
@@ -38 +38 @@
                         psMaskType maskBad, ///< Value to mask
                         psMaskType maskBlank, ///< Mask for blank region
-                        float badFrac   ///< Maximum fraction of bad input pixels to accept
+                        float badFrac,   ///< Maximum fraction of bad input pixels to accept
+                        pmSubtractionMode mode ///< Mode of subtraction
     );
 
+/// Determine which image to convolve
+pmSubtractionMode pmSubtractionOrder(pmSubtractionStampList *stamps, ///< Stamps that have been extracted
+                                     int footprint ///< Stamp half-size
+    );
+
+
 #endif