Index: trunk/psModules/src/camera/pmFPAHeader.c
===================================================================
--- trunk/psModules/src/camera/pmFPAHeader.c	(revision 18132)
+++ trunk/psModules/src/camera/pmFPAHeader.c	(revision 18137)
@@ -17,5 +17,5 @@
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-bool pmCellReadHeader(pmCell *cell, psFits *fits)
+bool pmCellReadHeader(pmCell *cell, psFits *fits, psDB *db)
 {
     PS_ASSERT_PTR_NON_NULL(cell, false);
@@ -23,5 +23,5 @@
 
     if (!cell->hdu) {
-        return pmChipReadHeader(cell->parent, fits);
+        return pmChipReadHeader(cell->parent, fits, db);
     }
     if (!pmHDUReadHeader(cell->hdu, fits)) {
@@ -30,9 +30,9 @@
     }
 
-    return pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_DATABASE, false, NULL);
+    return pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_DATABASE, false, db);
 }
 
 
-bool pmChipReadHeader(pmChip *chip, psFits *fits)
+bool pmChipReadHeader(pmChip *chip, psFits *fits, psDB *db)
 {
     PS_ASSERT_PTR_NON_NULL(chip, false);
@@ -40,5 +40,5 @@
 
     if (!chip->hdu) {
-        return pmFPAReadHeader(chip->parent, fits);
+        return pmFPAReadHeader(chip->parent, fits, db);
     }
     if (!pmHDUReadHeader(chip->hdu, fits)) {
@@ -47,5 +47,5 @@
     }
 
-    if (!pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_DATABASE, true, true, NULL)) {
+    if (!pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_DATABASE, true, true, db)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to read concepts for chip.\n");
         return false;
@@ -56,5 +56,5 @@
 
 
-bool pmFPAReadHeader(pmFPA *fpa, psFits *fits)
+bool pmFPAReadHeader(pmFPA *fpa, psFits *fits, psDB *db)
 {
     PS_ASSERT_PTR_NON_NULL(fpa, false);
@@ -69,5 +69,5 @@
     }
 
-    if (!pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_DATABASE, true, NULL)) {
+    if (!pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_DATABASE, true, db)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to read concepts for FPA.\n");
         return false;
Index: trunk/psModules/src/camera/pmFPAHeader.h
===================================================================
--- trunk/psModules/src/camera/pmFPAHeader.h	(revision 18132)
+++ trunk/psModules/src/camera/pmFPAHeader.h	(revision 18137)
@@ -4,6 +4,6 @@
  *  @author Paul Price, IfA
  * 
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-24 02:54:14 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-06-14 02:15:05 $
  *  Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -20,5 +20,6 @@
 /// was already there.  No iteration to lower levels is performed.
 bool pmFPAReadHeader(pmFPA *fpa,        ///< FPA for which to read header
-                     psFits *fits       ///< FITS file handle
+                     psFits *fits,       ///< FITS file handle
+		     psDB *db
                     );
 
@@ -28,5 +29,6 @@
 /// was already there.  No iteration to lower levels is performed.
 bool pmChipReadHeader(pmChip *chip,     ///< Chip for which to read header
-                      psFits *fits      ///< FITS file handle
+                      psFits *fits,      ///< FITS file handle
+		     psDB *db
                      );
 
@@ -36,5 +38,6 @@
 /// was already there.  No iteration to lower levels is performed.
 bool pmCellReadHeader(pmCell *cell,     ///< Cell for which to read header
-                      psFits *fits      ///< FITS file handle
+                      psFits *fits,      ///< FITS file handle
+		     psDB *db
                      );
 /// @}
Index: trunk/psModules/src/camera/pmFPARead.c
===================================================================
--- trunk/psModules/src/camera/pmFPARead.c	(revision 18132)
+++ trunk/psModules/src/camera/pmFPARead.c	(revision 18137)
@@ -81,5 +81,6 @@
 // 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,5 +94,5 @@
         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,5 +229,5 @@
         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,5 +416,5 @@
     }
 
-    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,5 +720,5 @@
 // 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,5 +741,5 @@
     }
 
-    if (!pmCellReadHeader(cell, fits)) {
+    if (!pmCellReadHeader(cell, fits, db)) {
         psError(PS_ERR_IO, false, "Unable to read header for cell!\n");
         return false;
@@ -921,10 +922,10 @@
 }
 
-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);
 }
 
Index: trunk/psModules/src/camera/pmFPARead.h
===================================================================
--- trunk/psModules/src/camera/pmFPARead.h	(revision 18132)
+++ trunk/psModules/src/camera/pmFPARead.h	(revision 18137)
@@ -4,6 +4,6 @@
  * @author Paul Price, IfA
  *
- * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-06-09 22:59:02 $
+ * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-06-14 02:15:05 $
  * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -56,5 +56,6 @@
                        psFits *fits,    // FITS file from which to read
                        int z,           // Readout number/plane; zero-offset indexing
-                       int numRows      // The number of rows to read
+                       int numRows,      // The number of rows to read
+		       psDB *db
                       );
 
@@ -62,5 +63,5 @@
 ///
 /// This function is type-independent (doesn't matter if you are interested in the image/mask/weight).
-int pmCellNumReadouts(pmCell *cell, psFits *fits);
+int pmCellNumReadouts(pmCell *cell, psFits *fits, psDB *db);
 
 /// Read an entire cell