Changeset 16580

Timestamp:

Feb 21, 2008, 3:20:24 PM (18 years ago)

Author:

Paul Price

Message:

The overlap needn't be applied by pmReadoutReadMore --- all it needs to know is how far the last read got. The overlapping works properly now.

Location:

trunk/psModules/src/camera

Files:

• pmFPARead.c (modified) (10 diffs)
• pmFPARead.h (modified) (4 diffs)

trunk/psModules/src/camera/pmFPARead.c

@@ -142 +142 @@
                                   pmReadout *readout, // Readout of interest
                                   int numScans, // Number of scans to read at a time
-                                  int overlap, // Number of scans to overlap with previous read
                                   fpaReadType type // Type of image
     )
@@ -192 +191 @@
         *next = (readdir == 1) ? trimsec->x0 : trimsec->y0;
     } else {
-        *next = image ? *readoutScansByType(readout, type) + numScans - overlap : 0;
+        *next = image ? *readoutScansByType(readout, type) + numScans : 0;
     }
     *last = (readdir == 1) ? trimsec->y1 : trimsec->x1;
@@ -203 +202 @@
                         int z,          // Plane number
                         int numScans,   // Number of scans to read at a time
-                        int overlap,    // Number of scans to overlap with last read
                         fpaReadType type // Type of image
     )
@@ -232 +230 @@
     int next;                           // Next position
     int last;                           // Last position
-    if (!readoutScanProperties(&next, &last, readout, numScans, overlap, type)) {
+    if (!readoutScanProperties(&next, &last, readout, numScans, type)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to determine readout properties.");
         return false;
@@ -419 +417 @@
     int next;                           // Next position
     int last;                           // Last position
-    if (!readoutScanProperties(&next, &last, readout, numScans, overlap, type)) {
+    if (!readoutScanProperties(&next, &last, readout, numScans, type)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to determine readout properties.");
         return false;
@@ -464 +462 @@
     int *scansTracker = readoutScansByType(readout, type); // Tracker for how many scans have been read
     *scansTracker = next;
+    if (next == 0) {
+        overlap = 0;
+    }
+    next -= overlap;
 
     // Calculate limits, adjust readout->row0,col0
@@ -477 +479 @@
         readout->row0 = trimsec->y0;
     }
-    int upper = next + numScans;        // Upper limit to next section
-    if (next != 0) {
-        upper += overlap;
-        *scansTracker += overlap;
-    }
+    int upper = next + numScans + overlap;        // Upper limit to next section
+    printf("READ: %d --> %d\n", next, upper);
 
     // Blow away existing data.
@@ -882 +881 @@
 
 
-bool pmReadoutMore(pmReadout *readout, psFits *fits, int z, int numScans, int overlap)
+bool pmReadoutMore(pmReadout *readout, psFits *fits, int z, int numScans)
 {
     PS_ASSERT_PTR_NON_NULL(readout, false);
     PS_ASSERT_FITS_NON_NULL(fits, false);
 
-    return readoutMore(readout, fits, z, numScans, overlap, FPA_READ_TYPE_IMAGE);
+    return readoutMore(readout, fits, z, numScans, FPA_READ_TYPE_IMAGE);
 }
 
@@ -945 +944 @@
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-bool pmReadoutMoreMask(pmReadout *readout, psFits *fits, int z, int numScans, int overlap)
+bool pmReadoutMoreMask(pmReadout *readout, psFits *fits, int z, int numScans)
 {
     PS_ASSERT_PTR_NON_NULL(readout, false);
     PS_ASSERT_FITS_NON_NULL(fits, false);
 
-    return readoutMore(readout, fits, z, numScans, overlap, FPA_READ_TYPE_MASK);
+    return readoutMore(readout, fits, z, numScans, FPA_READ_TYPE_MASK);
 }
 
@@ -999 +998 @@
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-bool pmReadoutMoreWeight(pmReadout *readout, psFits *fits, int z, int numScans, int overlap)
+bool pmReadoutMoreWeight(pmReadout *readout, psFits *fits, int z, int numScans)
 {
     PS_ASSERT_PTR_NON_NULL(readout, false);
     PS_ASSERT_FITS_NON_NULL(fits, false);
 
-    return readoutMore(readout, fits, z, numScans, overlap, FPA_READ_TYPE_WEIGHT);
+    return readoutMore(readout, fits, z, numScans, FPA_READ_TYPE_WEIGHT);
 }
 

trunk/psModules/src/camera/pmFPARead.h

@@ -4 +4 @@
  * @author Paul Price, IfA
  *
- * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-02-08 04:06:05 $
+ * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-02-22 01:20:24 $
  * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -19 +19 @@
                    psFits *fits,        ///< FITS file from which to read
                    int z,               ///< Readout number/plane; zero-offset indexing
-                   int numScans,        ///< Number of scans (rows/cols) to read
-                   int overlap          ///< Overlap between consecutive reads
+                   int numScans         ///< Number of scans (rows/cols) to read
     );
 
@@ -93 +92 @@
                        psFits *fits,    ///< FITS file from which to read
                        int z,           ///< Readout number/plane; zero-offset indexing
-                       int numScans,    ///< Number of scans (rows/cols) to read
-                       int overlap      ///< Overlap between consecutive reads
+                       int numScans     ///< Number of scans (rows/cols) to read
     );
 
@@ -143 +141 @@
                          psFits *fits,  ///< FITS file from which to read
                          int z,         ///< Readout number/plane; zero-offset indexing
-                         int numScans,  ///< Number of scans (rows/cols) to read
-                         int overlap    ///< Overlap between consecutive reads
+                         int numScans   ///< Number of scans (rows/cols) to read
     );