Changeset 18766

Timestamp:

Jul 29, 2008, 11:39:55 AM (18 years ago)

Author:

eugene

Message:

modifying the readout->ImageScan terms to record this and last scans

Location:

branches/eam_branch_20080719/psModules/src/camera

Files:

• pmFPA.c (modified) (2 diffs)
• pmFPA.h (modified) (2 diffs)

branches/eam_branch_20080719/psModules/src/camera/pmFPA.c

@@ -176 +176 @@
     readout->col0 = 0;
     readout->row0 = 0;
-    readout->imageScan = 0;
-    readout->maskScan = 0;
-    readout->weightScan = 0;
+
+    readout->thisImageScan = 0;
+    readout->thisMaskScan = 0;
+    readout->thisWeightScan = 0;
+
+    readout->lastImageScan = 0;
+    readout->lastMaskScan = 0;
+    readout->lastWeightScan = 0;
 }
 
@@ -269 +274 @@
     tmpReadout->col0 = 0;
 
-    tmpReadout->imageScan = 0;
-    tmpReadout->maskScan = 0;
-    tmpReadout->weightScan = 0;
+    tmpReadout->thisImageScan = 0;
+    tmpReadout->thisMaskScan = 0;
+    tmpReadout->thisWeightScan = 0;
+
+    tmpReadout->lastImageScan = 0;
+    tmpReadout->lastMaskScan = 0;
+    tmpReadout->lastWeightScan = 0;
 
     return(tmpReadout);

branches/eam_branch_20080719/psModules/src/camera/pmFPA.h

@@ -6 +6 @@
  * @author Eugene Magnier, IfA
  *
- * @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-06-05 01:31:33 $
+ * @version $Revision: 1.22.14.1 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-07-29 21:39:55 $
  * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -127 +127 @@
     bool file_exists;                   ///< Does the file for this readout exist (read case only)?
     bool data_exists;                   ///< Does the data for this readout exist (read case only)?
-    int imageScan, maskScan, weightScan;///< Separate tracking numbers for reading images incrementally
+    int thisImageScan;                  ///< start scan for next/current read
+    int lastImageScan;                  ///< start scan of the last read
+    int thisMaskScan;                   ///< start scan for next/current read
+    int lastMaskScan;                   ///< start scan of the last read
+    int thisWeightScan;                 ///< start scan for next/current read
+    int lastWeightScan;                 ///< start scan of the last read
 } pmReadout;