Changeset 25027 for branches/pap/psModules/src/camera/pmFPARead.c

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/camera/pmFPARead.c (modified) (25 diffs)

branches/pap/psModules/src/camera/pmFPARead.c

@@ -64 +64 @@
 
 // Set the "thisXXXScan" value in the readout for the appropriate image type
-static int readoutSetThisScan(pmReadout *readout, // Readout of interest
+static void readoutSetThisScan(pmReadout *readout, // Readout of interest
                               fpaReadType type, // Type of image
                               int thisScan // Starting scan number
@@ -72 +72 @@
       case FPA_READ_TYPE_IMAGE:
         readout->thisImageScan = thisScan;
-        return readout->lastImageScan;
+        return;
       case FPA_READ_TYPE_MASK:
         readout->thisMaskScan = thisScan;
-        return readout->lastMaskScan;
+        return;
       case FPA_READ_TYPE_VARIANCE:
         readout->thisVarianceScan = thisScan;
-        return readout->lastVarianceScan;
+        return;
       default:
         psAbort("Unknown read type: %x\n", type);
     }
-    return false;
 }
 
@@ -103 +102 @@
 
 // Set the "lastXXXScan" value in the readout for the appropriate image type
-static int readoutSetLastScan(pmReadout *readout, // Readout of interest
+static void readoutSetLastScan(pmReadout *readout, // Readout of interest
                               fpaReadType type, // Type of image
                               int lastScan // Last scan number
@@ -111 +110 @@
       case FPA_READ_TYPE_IMAGE:
         readout->lastImageScan = lastScan;
-        return readout->lastImageScan;
+        return;
       case FPA_READ_TYPE_MASK:
         readout->lastMaskScan = lastScan;
-        return readout->lastMaskScan;
+        return;
       case FPA_READ_TYPE_VARIANCE:
         readout->lastVarianceScan = lastScan;
-        return readout->lastVarianceScan;
+        return;
       default:
         psAbort("Unknown read type: %x\n", type);
     }
-    return false;
 }
 
@@ -143 +141 @@
 // Determine number of readouts in the FITS file
 // In the process, reads the header and concepts
-static bool cellNumReadouts(pmCell *cell,    // Cell of interest
+static int cellNumReadouts(pmCell *cell,    // Cell of interest
                             psFits *fits,    // FITS file
                             pmConfig *config // Configuration
@@ -155 +153 @@
     if (!hdu || hdu->blankPHU) {
         psError(PS_ERR_IO, true, "Unable to find HDU");
-        return false;
+        return 0;
     }
     if (!pmCellReadHeader(cell, fits, config)) {
         psError(PS_ERR_IO, false, "Unable to read header for cell!\n");
-        return false;
+        return 0;
     }
     if (!pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_CELLS, true, NULL)) {
         psError(PS_ERR_IO, false, "Failed to read concepts for cell.\n");
-        return false;
+        return 0;
     }
 
@@ -171 +169 @@
     if (!mdok) {
         psError(PS_ERR_IO, true, "Unable to find NAXIS in header for extension %s\n", hdu->extname);
-        return false;
-    }
+        return 0;
+    }
+
     if (naxis == 0) {
         // No pixels to read
         psError(PS_ERR_IO, true, "No pixels in extension %s.", hdu->extname);
-        return false;
+        return 0;
     }
     if (naxis < 2 || naxis > 3) {
         psError(PS_ERR_IO, true, "NAXIS in header of extension %s (= %d) is not valid.\n",
                 hdu->extname, naxis);
-        return false;
+        return 0;
     }
     int naxis3;                     // Number of image planes
@@ -188 +187 @@
         if (!mdok) {
             psError(PS_ERR_IO, true, "Unable to find NAXIS3 in header for extension %s\n", hdu->extname);
-            return false;
+            return 0;
         }
     } else {
@@ -296 +295 @@
 static bool readoutMore(pmReadout *readout, // Readout of interest
                         psFits *fits,    // FITS file
-                        int z,          // Plane number
+                        int z,          // Plane number to read
+                        int *zMax,      // Max plane number in this cell
                         int numScans,   // Number of scans to read at a time
                         fpaReadType type, // Type of image
@@ -310 +310 @@
     // N readouts, but numScans set to 0.  only the first should report that it requires data,
     // even if all readouts lack the image pointer.
-    if (!image) {
+    if (numScans == 0) {
+      if (!image) {
         return true;
-    }
-
-    // If we have already read an image, this result implies we are done (no more to read)
-    if (numScans == 0) {
-        return false;
+      } else {
+        return false;
+      }
     }
 
@@ -324 +323 @@
         return false;
     }
-    int naxis3 = cellNumReadouts(cell, fits, config); // Number of planes
-    if (z >= naxis3) {
+    *zMax = cellNumReadouts(cell, fits, config); // Number of planes
+    if (z >= *zMax) {
         // No more to read
         return false;
@@ -486 +485 @@
                              psFits *fits, // FITS file
                              int z,     // Desired image plane
+                             int *zMax, // Max plane number in this cell
                              int numScans, // Number of scans (row or col depends on CELL.READDIR); 0 for all
                              int overlap, // Number of scans (row/col) to overlap between scans
@@ -511 +511 @@
 
     int naxis3 = cellNumReadouts(cell, fits, config); // Number of image planes
+    if (zMax) *zMax = naxis3;
+
     if (z >= naxis3) {
         psError(PS_ERR_IO, false, "Desired image plane (%d) exceeds available number (%d).",
@@ -592 +594 @@
     }
 
-    // Determine the number of scans to read
-    int lastScan = readoutSetLastScan(readout, type, thisScan + numScans);
+    int origThisScan = thisScan;        // Original value of thisScan (starting point for read)
     if (thisScan == 0) {
         overlap = 0;
@@ -601 +602 @@
         thisScan = 0;
     }
-    readoutSetThisScan(readout, type, thisScan);
 
     // Calculate limits, adjust readout->row0,col0
@@ -620 +620 @@
         }
     }
+    int lastScan = origThisScan + numScans; // Last scan to read
+
+    readoutSetThisScan(readout, type, thisScan);
+    readoutSetLastScan(readout, type, lastScan);
 
     // Blow away existing data.
@@ -1021 +1025 @@
 
 
-bool pmReadoutMore(pmReadout *readout, psFits *fits, int z, int numScans, pmConfig *config)
+bool pmReadoutMore(pmReadout *readout, psFits *fits, int z, int *zMax, int numScans, pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(readout, false);
     PS_ASSERT_FITS_NON_NULL(fits, false);
 
-    return readoutMore(readout, fits, z, numScans, FPA_READ_TYPE_IMAGE, config);
-}
-
-bool pmReadoutReadChunk(pmReadout *readout, psFits *fits, int z, int numScans, int overlap, pmConfig *config)
+    return readoutMore(readout, fits, z, zMax, numScans, FPA_READ_TYPE_IMAGE, config);
+}
+
+bool pmReadoutReadChunk(pmReadout *readout, psFits *fits, int z, int *zMax, int numScans, int overlap, pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(readout, false);
@@ -1036 +1040 @@
     PS_ASSERT_INT_NONNEGATIVE(numScans, false);
 
-    return readoutReadChunk(readout, fits, z, numScans, overlap, FPA_READ_TYPE_IMAGE, config);
+    return readoutReadChunk(readout, fits, z, zMax, numScans, overlap, FPA_READ_TYPE_IMAGE, config);
 }
 
@@ -1044 +1048 @@
     PS_ASSERT_FITS_NON_NULL(fits, false);
 
-    return readoutReadChunk(readout, fits, z, 0, 0, FPA_READ_TYPE_IMAGE, config);
+    return readoutReadChunk(readout, fits, z, NULL, 0, 0, FPA_READ_TYPE_IMAGE, config);
 }
 
@@ -1084 +1088 @@
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-bool pmReadoutMoreMask(pmReadout *readout, psFits *fits, int z, int numScans, pmConfig *config)
+bool pmReadoutMoreMask(pmReadout *readout, psFits *fits, int z, int *zMax, int numScans, pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(readout, false);
     PS_ASSERT_FITS_NON_NULL(fits, false);
 
-    return readoutMore(readout, fits, z, numScans, FPA_READ_TYPE_MASK, config);
-}
-
-bool pmReadoutReadChunkMask(pmReadout *readout, psFits *fits, int z, int numScans, int overlap,
+    return readoutMore(readout, fits, z, zMax, numScans, FPA_READ_TYPE_MASK, config);
+}
+
+bool pmReadoutReadChunkMask(pmReadout *readout, psFits *fits, int z, int *zMax, int numScans, int overlap,
                             pmConfig *config)
 {
@@ -1100 +1104 @@
     PS_ASSERT_INT_NONNEGATIVE(numScans, false);
 
-    return readoutReadChunk(readout, fits, z, numScans, overlap, FPA_READ_TYPE_MASK, config);
+    return readoutReadChunk(readout, fits, z, zMax, numScans, overlap, FPA_READ_TYPE_MASK, config);
 }
 
@@ -1108 +1112 @@
     PS_ASSERT_FITS_NON_NULL(fits, false);
 
-    return readoutReadChunk(readout, fits, z, 0, 0, FPA_READ_TYPE_MASK, config);
+    return readoutReadChunk(readout, fits, z, NULL, 0, 0, FPA_READ_TYPE_MASK, config);
 }
 
@@ -1139 +1143 @@
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-bool pmReadoutMoreVariance(pmReadout *readout, psFits *fits, int z, int numScans, pmConfig *config)
+bool pmReadoutMoreVariance(pmReadout *readout, psFits *fits, int z, int *zMax, int numScans, pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(readout, false);
     PS_ASSERT_FITS_NON_NULL(fits, false);
 
-    return readoutMore(readout, fits, z, numScans, FPA_READ_TYPE_VARIANCE, config);
-}
-
-bool pmReadoutReadChunkVariance(pmReadout *readout, psFits *fits, int z, int numScans, int overlap,
+    return readoutMore(readout, fits, z, zMax, numScans, FPA_READ_TYPE_VARIANCE, config);
+}
+
+bool pmReadoutReadChunkVariance(pmReadout *readout, psFits *fits, int z, int *zMax, int numScans, int overlap,
                               pmConfig *config)
 {
@@ -1155 +1159 @@
     PS_ASSERT_INT_NONNEGATIVE(numScans, false);
 
-    return readoutReadChunk(readout, fits, z, numScans, overlap, FPA_READ_TYPE_VARIANCE, config);
+    return readoutReadChunk(readout, fits, z, zMax, numScans, overlap, FPA_READ_TYPE_VARIANCE, config);
 }
 
@@ -1163 +1167 @@
     PS_ASSERT_FITS_NON_NULL(fits, false);
 
-    return readoutReadChunk(readout, fits, z, 0, 0, FPA_READ_TYPE_VARIANCE, config);
+    return readoutReadChunk(readout, fits, z, NULL, 0, 0, FPA_READ_TYPE_VARIANCE, config);
 }