Changeset 16585

Timestamp:

Feb 21, 2008, 4:00:30 PM (18 years ago)

Author:

Paul Price

Message:

Tidying up.

File:

• branches/pap_branch_080214/psModules/src/imcombine/pmSubtraction.c (modified) (3 diffs)

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

@@ -4 +4 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.79 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-02-14 23:18:34 $
+ *  @version $Revision: 1.79.2.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-02-22 02:00:30 $
  *
  *  Copyright 2004-2007 Institute for Astronomy, University of Hawaii
@@ -688 +688 @@
     }
 
-    psImage *image, *weight;            // Image and weight map to convolve
+    const pmReadout *source;            // Source for image parameters
     switch (kernels->mode) {
       case PM_SUBTRACTION_MODE_TARGET:
       case PM_SUBTRACTION_MODE_1:
       case PM_SUBTRACTION_MODE_DUAL:
-        image = ro1->image;
-        weight = ro1->weight;
+        source = ro1;
         break;
       case PM_SUBTRACTION_MODE_2:
-        image = ro2->image;
-        weight = ro2->weight;
+        source = ro2;
         break;
       default:
         psAbort("Unsupported subtraction mode: %x", kernels->mode);
     }
-
-    int numCols = ro1->image->numCols, numRows = ro1->image->numRows; // Image dimensions
-    int x0 = ro1->col0, y0 = ro1->row0; // Image offset
+    psImage *image = source->image, *weight = source->weight; // Image and weight map to convolve
+    int numCols = image->numCols, numRows = image->numRows; // Image dimensions
+    int x0 = source->col0, y0 = source->row0; // Image offset
 
     psImage *convImage1 = out1->image;   // Convolved image
@@ -805 +803 @@
             polyValues = p_pmSubtractionPolynomial(polyValues, kernels->spatialOrder, xNorm, yNorm);
             float background = p_pmSubtractionSolutionBackground(kernels, polyValues); // Background term
-
+            background = 0.0;
             psRegion subRegion = psRegionSet(i, xSubMax, j, ySubMax); // Sub-region to convolve