Changeset 16689

Timestamp:

Feb 27, 2008, 2:15:03 PM (18 years ago)

Author:

Paul Price

Message:

Overlapping consecutive scans were interfering with each other. Restricted the region of combination. However, there's still a problem: rejection regions that transcend scans aren't being respected.

Location:

trunk/psModules/src

Files:

• camera/pmFPA.c (modified) (1 diff)
• imcombine/pmStack.c (modified) (2 diffs)

trunk/psModules/src/camera/pmFPA.c

@@ -172 +172 @@
     readout->mask = NULL;
     readout->bias = psListAlloc(NULL);
+
+    readout->col0 = 0;
+    readout->row0 = 0;
+
+    readout->imageScan = 0;
+    readout->maskScan = 0;
+    readout->weightScan = 0;
 }
 

trunk/psModules/src/imcombine/pmStack.c

@@ -8 +8 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-02-27 21:16:57 $
+ *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-02-28 00:15:03 $
  *  Copyright 2004-2007 Institute for Astronomy, University of Hawaii
  *
@@ -541 +541 @@
     PS_ASSERT_INT_POSITIVE(bad, false);
     PS_ASSERT_INT_NONNEGATIVE(numIter, false);
-    PS_ASSERT_FLOAT_LARGER_THAN(rej, 0.0, false);
+    if (isnan(rej)) {
+        PS_ASSERT_INT_EQUAL(numIter, 0);
+    } else {
+        PS_ASSERT_FLOAT_LARGER_THAN(rej, 0.0, false);
+    }
     if (havePixels) {
         // This is a subsequent combination, so expect that the image and mask already exist