Changeset 16586

Timestamp:

Feb 21, 2008, 4:27:40 PM (18 years ago)

Author:

Paul Price

Message:

Allow background to be applied optionally. This is to support the stacking, where we want to apply a matched filter --- the background term corrupts the filtered image.

Location:

branches/pap_branch_080214/psModules/src/imcombine

Files:

• pmSubtraction.c (modified) (3 diffs)
• pmSubtraction.h (modified) (2 diffs)
• pmSubtractionMatch.c (modified) (1 diff)

branches/pap_branch_080214/psModules/src/imcombine/pmSubtraction.c

@@ -4 +4 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.79.2.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-02-22 02:00:30 $
+ *  @version $Revision: 1.79.2.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-02-22 02:27:40 $
  *
  *  Copyright 2004-2007 Institute for Astronomy, University of Hawaii
@@ -636 +636 @@
 bool pmSubtractionConvolve(pmReadout *out1, pmReadout *out2, const pmReadout *ro1, const pmReadout *ro2,
                            const psImage *subMask, psMaskType blank, const psRegion *region,
-                           const pmSubtractionKernels *kernels, bool useFFT)
+                           const pmSubtractionKernels *kernels, bool doBG, bool useFFT)
 {
     PS_ASSERT_PTR_NON_NULL(out1, false);
@@ -802 +802 @@
             // (with the stamps) that it does not vary rapidly on this scale.
             polyValues = p_pmSubtractionPolynomial(polyValues, kernels->spatialOrder, xNorm, yNorm);
-            float background = p_pmSubtractionSolutionBackground(kernels, polyValues); // Background term
-            background = 0.0;
+            float background = doBG ? p_pmSubtractionSolutionBackground(kernels, polyValues) :
+                0.0; // Background term
             psRegion subRegion = psRegionSet(i, xSubMax, j, ySubMax); // Sub-region to convolve
 

branches/pap_branch_080214/psModules/src/imcombine/pmSubtraction.h

@@ -6 +6 @@
  * @author GLG, MHPCC
  *
- * @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-12-07 01:57:15 $
+ * @version $Revision: 1.22.6.1 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-02-22 02:27:40 $
  * Copyright 2004-207 Institute for Astronomy, University of Hawaii
  */
@@ -92 +92 @@
                            const psRegion *region, ///< Region to convolve (or NULL)
                            const pmSubtractionKernels *kernels, ///< Kernel parameters
+                           bool doBG,   ///< Apply background term?
                            bool useFFT  ///< Use Fast Fourier Transform for the convolution?
     );

branches/pap_branch_080214/psModules/src/imcombine/pmSubtractionMatch.c

@@ -463 +463 @@
 
             psTrace("psModules.imcombine", 2, "Convolving...\n");
-            if (!pmSubtractionConvolve(conv1, conv2, ro1, ro2, subMask, maskBlank, region, kernels, useFFT)) {
+            if (!pmSubtractionConvolve(conv1, conv2, ro1, ro2, subMask, maskBlank, region, kernels,
+                                       true, useFFT)) {
                 psError(PS_ERR_UNKNOWN, false, "Unable to convolve image.");
                 goto MATCH_ERROR;