Changeset 18137 for trunk/psModules/src/camera/pmFPARead.c

Timestamp:

Jun 13, 2008, 4:16:47 PM (18 years ago)

Author:

eugene

Message:

supplying db handle to concept loading functions

File:

• trunk/psModules/src/camera/pmFPARead.c (modified) (7 diffs)

trunk/psModules/src/camera/pmFPARead.c

@@ -81 +81 @@
 // In the process, reads the header and concepts
 static bool cellNumReadouts(pmCell *cell,    // Cell of interest
-                            psFits *fits     // FITS file
+                            psFits *fits,    // FITS file
+                            psDB *db
     )
 {
@@ -93 +94 @@
         return false;
     }
-    if (!pmCellReadHeader(cell, fits)) {
+    if (!pmCellReadHeader(cell, fits, db)) {
         psError(PS_ERR_IO, false, "Unable to read header for cell!\n");
         return false;
@@ -228 +229 @@
         return false;
     }
-    int naxis3 = cellNumReadouts(cell, fits); // Number of planes
+    int naxis3 = cellNumReadouts(cell, fits, db); // Number of planes
     if (z >= naxis3) {
         // No more to read
@@ -415 +416 @@
     }
 
-    int naxis3 = cellNumReadouts(cell, fits); // Number of image planes
+    int naxis3 = cellNumReadouts(cell, fits, db); // Number of image planes
     if (z >= naxis3) {
         psError(PS_ERR_IO, false, "Desired image plane (%d) exceeds available number (%d).",
@@ -719 +720 @@
 // pmReadoutReadNext is maintained here (for now) to maintain backwards compatibility.
 // pmReadoutReadNext has been replaced by pmReadoutRead, pmReadoutReadChunk, pmReadoutMore
-bool pmReadoutReadNext(bool *status, pmReadout *readout, psFits *fits, int z, int numScans)
+bool pmReadoutReadNext(bool *status, pmReadout *readout, psFits *fits, int z, int numScans, psDB *db)
 {
     PS_ASSERT_PTR_NON_NULL(readout, false);
@@ -740 +741 @@
     }
 
-    if (!pmCellReadHeader(cell, fits)) {
+    if (!pmCellReadHeader(cell, fits, db)) {
         psError(PS_ERR_IO, false, "Unable to read header for cell!\n");
         return false;
@@ -921 +922 @@
 }
 
-int pmCellNumReadouts(pmCell *cell, psFits *fits)
+int pmCellNumReadouts(pmCell *cell, psFits *fits, psDB *db)
 {
     PS_ASSERT_PTR_NON_NULL(cell, false);
     PS_ASSERT_FITS_NON_NULL(fits, false);
 
-    return cellNumReadouts(cell, fits);
+    return cellNumReadouts(cell, fits, db);
 }