Changeset 14528

Timestamp:

Aug 15, 2007, 5:58:29 PM (19 years ago)

Author:

Paul Price

Message:

Ensure correct region is used when cutting down the weight map.

File:

• trunk/psModules/src/imcombine/pmSubtraction.c (modified) (2 diffs)

trunk/psModules/src/imcombine/pmSubtraction.c

@@ -4 +4 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-08-16 03:55:52 $
+ *  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-08-16 03:58:29 $
  *
  *  Copyright 2004-2007 Institute for Astronomy, University of Hawaii
@@ -696 +696 @@
             psImage *convolvedStamp = convolution->image; // Image of the convolution
             psImage *input = stamp->input->image; // Input image postage stamp
+            psImage *weight = stamp->weight->image; // Weight image postage stamp
 
             // Region of interest
-            psRegion region = psRegionSet(input->col0 + size, input->col0 + size + 2 * footprint + 1,
+            psRegion inRegion = psRegionSet(input->col0 + size, input->col0 + size + 2 * footprint + 1,
                                           input->row0 + size, input->row0 + size + 2 * footprint + 1);
-
-            psImage *inStamp = psImageSubset(stamp->input->image, region); // Image of stamp
-            psImage *wtStamp = psImageSubset(stamp->weight->image, region); // Image of stamp
+            psRegion wtRegion = (input == weight ? inRegion :
+                                 psRegionSet(weight->col0 + size, weight->col0 + size + 2 * footprint + 1,
+                                             weight->row0 + size, weight->row0 + size + 2 * footprint + 1));
+
+            psImage *inStamp = psImageSubset(stamp->input->image, inRegion); // Image of stamp
+            psImage *wtStamp = psImageSubset(stamp->weight->image, wtRegion); // Image of stamp
             assert(convolvedStamp->numCols == inStamp->numCols &&
                    convolvedStamp->numRows == inStamp->numRows);