Changeset 14639 for branches/eam_branch_20070817/psModules/src/imcombine/pmSubtraction.c

Timestamp:

Aug 23, 2007, 12:30:43 PM (19 years ago)

Author:

magnier

Message:

update to sync with HEAD dev work

File:

• branches/eam_branch_20070817/psModules/src/imcombine/pmSubtraction.c (modified) (6 diffs)

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

@@ -4 +4 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-08-17 01:50:50 $
+ *  @version $Revision: 1.42.2.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-08-23 22:30:43 $
  *
  *  Copyright 2004-2007 Institute for Astronomy, University of Hawaii
@@ -24 +24 @@
 
 #include "pmSubtraction.h"
+
+#define PIXEL_LIST_BUFFER 100           // Number of entries to add to pixel list at a time
+
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -136 +139 @@
 
               // Normalising sum of kernel component to unity
-              float norm = kernelWeighting(1.0 / (float)((uStop - uStart) * (vStop - vStart)),
+              float norm = kernelWeighting(1.0 / (float)((uStop - uStart + 1) * (vStop - vStart + 1)),
                                            varianceWeighting);
 
@@ -245 +248 @@
               }
           }
-          sum /= (uStop - uStart) * (vStop - vStart); // Normalising sum of kernel component to unity
+          sum /= (uStop - uStart + 1) * (vStop - vStart + 1); // Normalising sum of kernel component to unity
           if (kernels->spatialOrder > 0 && index != kernels->subIndex) {
               // The (0,0) element is subtracted from most kernels to preserve photometric scaling
@@ -880 +883 @@
     }
 
-    float background = solution->data.F64[solution->n-1]; // The difference in background
+    int numBackground = polyTerms(kernels->bgOrder); // Number of background terms
+    float background = solution->data.F64[solution->n - numBackground]; // The difference in background
     int numCols = inImage->numCols, numRows = inImage->numRows; // Image dimensions
 
@@ -1017 +1021 @@
     return true;
 }
+
+