Changeset 29601

Timestamp:

Oct 28, 2010, 5:53:21 PM (16 years ago)

Author:

eugene

Message:

add some compile-time options (CENTRAL_DELTA & ZERO_KERNEL_ZERO_FLUX)

Location:

trunk/psModules/src/imcombine

Files:

• pmSubtraction.h (modified) (1 diff)
• pmSubtractionAnalysis.h (modified) (1 diff)
• pmSubtractionKernels.h (modified) (1 diff)
• pmSubtractionVisual.h (modified) (1 diff)

trunk/psModules/src/imcombine/pmSubtraction.h

@@ -20 +20 @@
 #include <pmSubtractionKernels.h>
 #include <pmSubtractionStamps.h>
+
+// if we use the original ppSub implementation, we subtract a central delta-function for all
+// kernels to for a zero integral.  in the Alard-Lupton style zeroing, we can either subtract a
+// Gaussian from all kernels (ZERO_KERNEL_ZERO_FLUX), or we can subtract it from all but the
+// first kernel.
+# define CENTRAL_DELTA 0
+# define ZERO_KERNEL_ZERO_FLUX 1
 
 /// @addtogroup imcombine Image Combinations

trunk/psModules/src/imcombine/pmSubtractionAnalysis.h

@@ -22 +22 @@
 #define PM_SUBTRACTION_ANALYSIS_MXY          "SUBTRACTION.MXY"          // Kernel moment in xy
 #define PM_SUBTRACTION_ANALYSIS_MYY          "SUBTRACTION.MYY"          // Kernel moment in yy
-#define PM_SUBTRACTION_ANALYSIS_DECONV_MAX   "SUBTRACTION.DECONV.MAX"   // Maximum deconvolution fraction
+
+#define PM_SUBTRACTION_ANALYSIS_CONVOL_MAX   "SUBTRACTION.CONVOL.MAX"   // Maximum Convolution fraction
+#define PM_SUBTRACTION_ANALYSIS_DECONV_MAX   "SUBTRACTION.DECONV.MAX"   // Maximum Deconvolution fraction
 
 #define PM_SUBTRACTION_ANALYSIS_FRES_SIGMA_MEAN  "SUBTRACTION.FRES.MEAN" // RMS stamp deviation

trunk/psModules/src/imcombine/pmSubtractionKernels.h

@@ -310 +310 @@
     );
 
+psImage *pmSubtractionKernelsImageMosaic(pmSubtractionKernels *kernels);
+
 #endif

trunk/psModules/src/imcombine/pmSubtractionVisual.h

@@ -3 +3 @@
 
 bool pmSubtractionVisualClose(void);
-bool pmSubtractionVisualPlotConvKernels(psImage *convKernels);
+bool pmSubtractionVisualPlotConvKernels(pmSubtractionKernels *kernels);
 bool pmSubtractionVisualPlotStamps(pmSubtractionStampList *stamps, pmReadout *ro);
 bool pmSubtractionVisualPlotLeastSquares(pmSubtractionStampList *stamps);