Changeset 18163 for trunk/psModules/src/camera

Timestamp:

Jun 17, 2008, 12:16:38 PM (18 years ago)

Author:

Paul Price

Message:

Changing use of psDB* to pmConfig* so that the database handle only has to be set up when required.

Location:

trunk/psModules/src/camera

Files:

• pmFPAHeader.c (modified) (7 diffs)
• pmFPAHeader.h (modified) (4 diffs)
• pmFPARead.c (modified) (25 diffs)
• pmFPARead.h (modified) (25 diffs)
• pmFPAWrite.c (modified) (6 diffs)
• pmFPAWrite.h (modified) (11 diffs)
• pmFPAfileFitsIO.c (modified) (18 diffs)
• pmFPAfileFitsIO.h (modified) (9 diffs)

trunk/psModules/src/camera/pmFPAHeader.c

@@ -17 +17 @@
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-bool pmCellReadHeader(pmCell *cell, psFits *fits, psDB *db)
+bool pmCellReadHeader(pmCell *cell, psFits *fits, pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(cell, false);
@@ -23 +23 @@
 
     if (!cell->hdu) {
-        return pmChipReadHeader(cell->parent, fits, db);
+        return pmChipReadHeader(cell->parent, fits, config);
     }
     if (!pmHDUReadHeader(cell->hdu, fits)) {
@@ -30 +30 @@
     }
 
-    return pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_DATABASE, false, db);
+    return pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_DATABASE, false, config);
 }
 
 
-bool pmChipReadHeader(pmChip *chip, psFits *fits, psDB *db)
+bool pmChipReadHeader(pmChip *chip, psFits *fits, pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(chip, false);
@@ -40 +40 @@
 
     if (!chip->hdu) {
-        return pmFPAReadHeader(chip->parent, fits, db);
+        return pmFPAReadHeader(chip->parent, fits, config);
     }
     if (!pmHDUReadHeader(chip->hdu, fits)) {
@@ -47 +47 @@
     }
 
-    if (!pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_DATABASE, true, true, db)) {
+    if (!pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_DATABASE, true, true, config)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to read concepts for chip.\n");
         return false;
@@ -56 +56 @@
 
 
-bool pmFPAReadHeader(pmFPA *fpa, psFits *fits, psDB *db)
+bool pmFPAReadHeader(pmFPA *fpa, psFits *fits, pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(fpa, false);
@@ -69 +69 @@
     }
 
-    if (!pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_DATABASE, true, db)) {
+    if (!pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_DATABASE, true, config)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to read concepts for FPA.\n");
         return false;

trunk/psModules/src/camera/pmFPAHeader.h

@@ -1 +1 @@
 /*  @file pmFPAHeader.h
  *  @brief Functions read FITS headers for FPA components
- * 
+ *
  *  @author Paul Price, IfA
- * 
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-06-14 02:15:05 $
+ *
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-06-17 22:16:38 $
  *  Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -21 +21 @@
 bool pmFPAReadHeader(pmFPA *fpa,        ///< FPA for which to read header
                      psFits *fits,       ///< FITS file handle
-                     psDB *db
+                     pmConfig *config   ///< Configuration
                     );
 
@@ -30 +30 @@
 bool pmChipReadHeader(pmChip *chip,     ///< Chip for which to read header
                       psFits *fits,      ///< FITS file handle
-                     psDB *db
+                     pmConfig *config   ///< Configuration
                      );
 
@@ -39 +39 @@
 bool pmCellReadHeader(pmCell *cell,     ///< Cell for which to read header
                       psFits *fits,      ///< FITS file handle
-                     psDB *db
+                     pmConfig *config   ///< Configuration
                      );
 /// @}

trunk/psModules/src/camera/pmFPARead.c

@@ -82 +82 @@
 static bool cellNumReadouts(pmCell *cell,    // Cell of interest
                             psFits *fits,    // FITS file
-                            psDB *db
+                            pmConfig *config // Configuration
     )
 {
@@ -94 +94 @@
         return false;
     }
-    if (!pmCellReadHeader(cell, fits, db)) {
+    if (!pmCellReadHeader(cell, fits, config)) {
         psError(PS_ERR_IO, false, "Unable to read header for cell!\n");
         return false;
@@ -143 +143 @@
                                   int numScans, // Number of scans to read at a time
                                   fpaReadType type, // Type of image
-                                  psDB *db // Database handle for concepts
+                                  pmConfig *config // Configuration
     )
 {
@@ -153 +153 @@
 
     if (!pmConceptsReadCell(readout->parent, PM_CONCEPT_SOURCE_DEFAULTS | PM_CONCEPT_SOURCE_DATABASE,
-                            true, db)) {
+                            true, config)) {
         psError(PS_ERR_IO, false, "Failed to read concepts for cell.");
         return false;
@@ -209 +209 @@
                         int numScans,   // Number of scans to read at a time
                         fpaReadType type, // Type of image
-                        psDB *db        // Database handle for concepts
+                        pmConfig *config// Configuration
     )
 {
@@ -229 +229 @@
         return false;
     }
-    int naxis3 = cellNumReadouts(cell, fits, db); // Number of planes
+    int naxis3 = cellNumReadouts(cell, fits, config); // Number of planes
     if (z >= naxis3) {
         // No more to read
@@ -237 +237 @@
     int next;                           // Next position
     int last;                           // Last position
-    if (!readoutScanProperties(&next, &last, readout, numScans, type, db)) {
+    if (!readoutScanProperties(&next, &last, readout, numScans, type, config)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to determine readout properties.");
         return false;
@@ -395 +395 @@
                              int overlap, // Number of scans (row/col) to overlap between scans
                              fpaReadType type, // Type of image
-                             psDB *db   // Database handle for concepts
+                             pmConfig *config   // Configuration
     )
 {
@@ -416 +416 @@
     }
 
-    int naxis3 = cellNumReadouts(cell, fits, db); // Number of image planes
+    int naxis3 = cellNumReadouts(cell, fits, config); // Number of image planes
     if (z >= naxis3) {
         psError(PS_ERR_IO, false, "Desired image plane (%d) exceeds available number (%d).",
@@ -425 +425 @@
     int next;                           // Next position
     int last;                           // Last position
-    if (!readoutScanProperties(&next, &last, readout, numScans, type, db)) {
+    if (!readoutScanProperties(&next, &last, readout, numScans, type, config)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to determine readout properties.");
         return false;
@@ -532 +532 @@
 static bool cellRead(pmCell *cell,      // Cell into which to read
                      psFits *fits,      // FITS file from which to read
-                     psDB *db,          // Database handle, for concepts ingest
+                     pmConfig *config,  // Configuration
                      fpaReadType type   // Type to read
                     )
@@ -578 +578 @@
 
     // load in the concept information for this cell
-    if (!pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_DATABASE, true, db)) {
+    if (!pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_DATABASE, true, config)) {
         //psError(PS_ERR_UNKNOWN, false, "Failed to read concepts for cell");
         //return false;
@@ -653 +653 @@
 static bool chipRead(pmChip *chip,      // Chip into which to read
                      psFits *fits,      // FITS file from which to read
-                     psDB *db,          // Database handle, for concepts ingest
+                     pmConfig *config,  // Configuration
                      fpaReadType type   // Type to read
                     )
@@ -664 +664 @@
     for (int i = 0; i < cells->n; i++) {
         pmCell *cell = cells->data[i];  // The cell of interest
-        success |= cellRead(cell, fits, db, type);
+        success |= cellRead(cell, fits, config, type);
     }
     if (success) {
@@ -684 +684 @@
 static bool fpaRead(pmFPA *fpa,         // FPA into which to read
                     psFits *fits,       // FITS file from which to read
-                    psDB *db,           // Database handle, for concepts ingest
+                    pmConfig *config,   // Configuration
                     fpaReadType type    // Type to read
                    )
@@ -695 +695 @@
     for (int i = 0; i < chips->n; i++) {
         pmChip *chip = chips->data[i];  // The cell of interest
-        success |= chipRead(chip, fits, db, type);
+        success |= chipRead(chip, fits, config, type);
     }
     if (success) {
@@ -720 +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, psDB *db)
+bool pmReadoutReadNext(bool *status, pmReadout *readout, psFits *fits, int z, int numScans, pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(readout, false);
@@ -741 +741 @@
     }
 
-    if (!pmCellReadHeader(cell, fits, db)) {
+    if (!pmCellReadHeader(cell, fits, config)) {
         psError(PS_ERR_IO, false, "Unable to read header for cell!\n");
         return false;
@@ -896 +896 @@
 
 
-bool pmReadoutMore(pmReadout *readout, psFits *fits, int z, int numScans, psDB *db)
+bool pmReadoutMore(pmReadout *readout, psFits *fits, int z, 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, db);
-}
-
-bool pmReadoutReadChunk(pmReadout *readout, psFits *fits, int z, int numScans, int overlap, psDB *db)
+    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)
 {
     PS_ASSERT_PTR_NON_NULL(readout, false);
@@ -911 +911 @@
     PS_ASSERT_INT_NONNEGATIVE(numScans, false);
 
-    return readoutReadChunk(readout, fits, z, numScans, overlap, FPA_READ_TYPE_IMAGE, db);
-}
-
-bool pmReadoutRead(pmReadout *readout, psFits *fits, int z, psDB *db)
+    return readoutReadChunk(readout, fits, z, numScans, overlap, FPA_READ_TYPE_IMAGE, config);
+}
+
+bool pmReadoutRead(pmReadout *readout, psFits *fits, int z, pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(readout, false);
     PS_ASSERT_FITS_NON_NULL(fits, false);
 
-    return readoutReadChunk(readout, fits, z, 0, 0, FPA_READ_TYPE_IMAGE, db);
-}
-
-int pmCellNumReadouts(pmCell *cell, psFits *fits, psDB *db)
+    return readoutReadChunk(readout, fits, z, 0, 0, FPA_READ_TYPE_IMAGE, config);
+}
+
+int pmCellNumReadouts(pmCell *cell, psFits *fits, pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(cell, false);
     PS_ASSERT_FITS_NON_NULL(fits, false);
 
-    return cellNumReadouts(cell, fits, db);
-}
-
-bool pmCellRead(pmCell *cell, psFits *fits, psDB *db)
+    return cellNumReadouts(cell, fits, config);
+}
+
+bool pmCellRead(pmCell *cell, psFits *fits, pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(cell, false);
     PS_ASSERT_FITS_NON_NULL(fits, false);
 
-    return cellRead(cell, fits, db, FPA_READ_TYPE_IMAGE);
-}
-
-bool pmChipRead(pmChip *chip, psFits *fits, psDB *db)
+    return cellRead(cell, fits, config, FPA_READ_TYPE_IMAGE);
+}
+
+bool pmChipRead(pmChip *chip, psFits *fits, pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(chip, false);
     PS_ASSERT_FITS_NON_NULL(fits, false);
 
-    return chipRead(chip, fits, db, FPA_READ_TYPE_IMAGE);
-}
-
-bool pmFPARead(pmFPA *fpa, psFits *fits, psDB *db)
+    return chipRead(chip, fits, config, FPA_READ_TYPE_IMAGE);
+}
+
+bool pmFPARead(pmFPA *fpa, psFits *fits, pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(fpa, false);
     PS_ASSERT_FITS_NON_NULL(fits, false);
 
-    return fpaRead(fpa, fits, db, FPA_READ_TYPE_IMAGE);
+    return fpaRead(fpa, fits, config, FPA_READ_TYPE_IMAGE);
 }
 
@@ -959 +959 @@
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-bool pmReadoutMoreMask(pmReadout *readout, psFits *fits, int z, int numScans, psDB *db)
+bool pmReadoutMoreMask(pmReadout *readout, psFits *fits, int z, 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, db);
-}
-
-bool pmReadoutReadChunkMask(pmReadout *readout, psFits *fits, int z, int numScans, int overlap, psDB *db)
+    return readoutMore(readout, fits, z, numScans, FPA_READ_TYPE_MASK, config);
+}
+
+bool pmReadoutReadChunkMask(pmReadout *readout, psFits *fits, int z, int numScans, int overlap,
+                            pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(readout, false);
@@ -974 +975 @@
     PS_ASSERT_INT_NONNEGATIVE(numScans, false);
 
-    return readoutReadChunk(readout, fits, z, numScans, overlap, FPA_READ_TYPE_MASK, db);
-}
-
-bool pmReadoutReadMask(pmReadout *readout, psFits *fits, int z, psDB *db)
+    return readoutReadChunk(readout, fits, z, numScans, overlap, FPA_READ_TYPE_MASK, config);
+}
+
+bool pmReadoutReadMask(pmReadout *readout, psFits *fits, int z, pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(readout, false);
     PS_ASSERT_FITS_NON_NULL(fits, false);
 
-    return readoutReadChunk(readout, fits, z, 0, 0, FPA_READ_TYPE_MASK, db);
-}
-
-bool pmCellReadMask(pmCell *cell, psFits *fits, psDB *db)
+    return readoutReadChunk(readout, fits, z, 0, 0, FPA_READ_TYPE_MASK, config);
+}
+
+bool pmCellReadMask(pmCell *cell, psFits *fits, pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(cell, false);
     PS_ASSERT_FITS_NON_NULL(fits, false);
 
-    return cellRead(cell, fits, db, FPA_READ_TYPE_MASK);
-}
-
-bool pmChipReadMask(pmChip *chip, psFits *fits, psDB *db)
+    return cellRead(cell, fits, config, FPA_READ_TYPE_MASK);
+}
+
+bool pmChipReadMask(pmChip *chip, psFits *fits, pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(chip, false);
     PS_ASSERT_FITS_NON_NULL(fits, false);
 
-    return chipRead(chip, fits, db, FPA_READ_TYPE_MASK);
-}
-
-bool pmFPAReadMask(pmFPA *fpa, psFits *fits, psDB *db)
+    return chipRead(chip, fits, config, FPA_READ_TYPE_MASK);
+}
+
+bool pmFPAReadMask(pmFPA *fpa, psFits *fits, pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(fpa, false);
     PS_ASSERT_FITS_NON_NULL(fits, false);
 
-    return fpaRead(fpa, fits, db, FPA_READ_TYPE_MASK);
+    return fpaRead(fpa, fits, config, FPA_READ_TYPE_MASK);
 }
 
@@ -1013 +1014 @@
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-bool pmReadoutMoreWeight(pmReadout *readout, psFits *fits, int z, int numScans, psDB *db)
+bool pmReadoutMoreWeight(pmReadout *readout, psFits *fits, int z, 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_WEIGHT, db);
-}
-
-bool pmReadoutReadChunkWeight(pmReadout *readout, psFits *fits, int z, int numScans, int overlap, psDB *db)
+    return readoutMore(readout, fits, z, numScans, FPA_READ_TYPE_WEIGHT, config);
+}
+
+bool pmReadoutReadChunkWeight(pmReadout *readout, psFits *fits, int z, int numScans, int overlap,
+                              pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(readout, false);
@@ -1028 +1030 @@
     PS_ASSERT_INT_NONNEGATIVE(numScans, false);
 
-    return readoutReadChunk(readout, fits, z, numScans, overlap, FPA_READ_TYPE_WEIGHT, db);
-}
-
-bool pmReadoutReadWeight(pmReadout *readout, psFits *fits, int z, psDB *db)
+    return readoutReadChunk(readout, fits, z, numScans, overlap, FPA_READ_TYPE_WEIGHT, config);
+}
+
+bool pmReadoutReadWeight(pmReadout *readout, psFits *fits, int z, pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(readout, false);
     PS_ASSERT_FITS_NON_NULL(fits, false);
 
-    return readoutReadChunk(readout, fits, z, 0, 0, FPA_READ_TYPE_WEIGHT, db);
-}
-
-bool pmCellReadWeight(pmCell *cell, psFits *fits, psDB *db)
+    return readoutReadChunk(readout, fits, z, 0, 0, FPA_READ_TYPE_WEIGHT, config);
+}
+
+bool pmCellReadWeight(pmCell *cell, psFits *fits, pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(cell, false);
     PS_ASSERT_FITS_NON_NULL(fits, false);
 
-    return cellRead(cell, fits, db, FPA_READ_TYPE_WEIGHT);
-}
-
-bool pmChipReadWeight(pmChip *chip, psFits *fits, psDB *db)
+    return cellRead(cell, fits, config, FPA_READ_TYPE_WEIGHT);
+}
+
+bool pmChipReadWeight(pmChip *chip, psFits *fits, pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(chip, false);
     PS_ASSERT_FITS_NON_NULL(fits, false);
 
-    return chipRead(chip, fits, db, FPA_READ_TYPE_WEIGHT);
-}
-
-bool pmFPAReadWeight(pmFPA *fpa, psFits *fits, psDB *db)
+    return chipRead(chip, fits, config, FPA_READ_TYPE_WEIGHT);
+}
+
+bool pmFPAReadWeight(pmFPA *fpa, psFits *fits, pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(fpa, false);
     PS_ASSERT_FITS_NON_NULL(fits, false);
 
-    return fpaRead(fpa, fits, db, FPA_READ_TYPE_WEIGHT);
+    return fpaRead(fpa, fits, config, FPA_READ_TYPE_WEIGHT);
 }
 
@@ -1067 +1069 @@
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-bool pmCellReadHeaderSet(pmCell *cell, psFits *fits, psDB *db)
+bool pmCellReadHeaderSet(pmCell *cell, psFits *fits, pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(cell, false);
     PS_ASSERT_FITS_NON_NULL(fits, false);
 
-    return cellRead(cell, fits, db, FPA_READ_TYPE_HEADER);
-}
-
-bool pmChipReadHeaderSet(pmChip *chip, psFits *fits, psDB *db)
+    return cellRead(cell, fits, config, FPA_READ_TYPE_HEADER);
+}
+
+bool pmChipReadHeaderSet(pmChip *chip, psFits *fits, pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(chip, false);
     PS_ASSERT_FITS_NON_NULL(fits, false);
 
-    return chipRead(chip, fits, db, FPA_READ_TYPE_HEADER);
-}
-
-bool pmFPAReadHeaderSet(pmFPA *fpa, psFits *fits, psDB *db)
+    return chipRead(chip, fits, config, FPA_READ_TYPE_HEADER);
+}
+
+bool pmFPAReadHeaderSet(pmFPA *fpa, psFits *fits, pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(fpa, false);
     PS_ASSERT_FITS_NON_NULL(fits, false);
 
-    return fpaRead(fpa, fits, db, FPA_READ_TYPE_HEADER);
+    return fpaRead(fpa, fits, config, FPA_READ_TYPE_HEADER);
 }
 

trunk/psModules/src/camera/pmFPARead.h

@@ -4 +4 @@
  * @author Paul Price, IfA
  *
- * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-06-14 02:15:05 $
+ * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-06-17 22:16:38 $
  * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -11 +11 @@
 #ifndef PM_FPA_READ_H
 #define PM_FPA_READ_H
+
+#include <pmConfig.h>
 
 /// @addtogroup Camera Camera Layout
@@ -20 +22 @@
                    int z,               ///< Readout number/plane; zero-offset indexing
                    int numScans,        ///< Number of scans (rows/cols) to read
-                   psDB *db             ///< Database handle for concepts
+                   pmConfig *config     ///< Configuration
     );
 
@@ -31 +33 @@
                         int numScans,   ///< Number of scans (rows/cols) to read
                         int overlap,    ///< Overlap between consecutive reads
-                        psDB *db        ///< Database handle for concepts
+                        pmConfig *config ///< Configuration
     );
 
@@ -38 +40 @@
                    psFits *fits,        ///< FITS file from which to read
                    int z,               ///< Readout number/plane; zero-offset indexing
-                   psDB *db             ///< Database handle for concepts
+                   pmConfig *config     ///< Configuration
     );
 
@@ -57 +59 @@
                        int z,           // Readout number/plane; zero-offset indexing
                        int numRows,      // The number of rows to read
-                       psDB *db
+                       pmConfig *config
                       );
 
@@ -63 +65 @@
 ///
 /// This function is type-independent (doesn't matter if you are interested in the image/mask/weight).
-int pmCellNumReadouts(pmCell *cell, psFits *fits, psDB *db);
+int pmCellNumReadouts(pmCell *cell, psFits *fits, pmConfig *config);
 
 /// Read an entire cell
@@ -71 +73 @@
 bool pmCellRead(pmCell *cell,           // Cell to read into
                 psFits *fits,           // FITS file from which to read
-                psDB *db                // Database handle, for "concepts" ingest
+                pmConfig *config        // Configuration
                );
 
@@ -79 +81 @@
 bool pmChipRead(pmChip *chip,           // Chip to read into
                 psFits *fits,           // FITS file from which to read
-                psDB *db                // Database handle, for "concepts" ingest
+                pmConfig *config        // Configuration
                );
 
@@ -87 +89 @@
 bool pmFPARead(pmFPA *fpa,              // FPA to read into
                psFits *fits,            // FITS file from which to read
-               psDB *db                 // Database handle, for "concepts" ingest
+               pmConfig *config         // Configuration
               );
 
@@ -97 +99 @@
                        int z,           ///< Readout number/plane; zero-offset indexing
                        int numScans,    ///< Number of scans (rows/cols) to read
-                       psDB *db         ///< Database handle for concepts
+                       pmConfig *config ///< Configuration
     );
 
@@ -108 +110 @@
                             int numScans, ///< Number of scans (rows/cols) to read
                             int overlap, ///< Overlap between consecutive reads
-                            psDB *db    ///< Database handle for concepts
+                            pmConfig *config ///< Configuration
     );
 
@@ -115 +117 @@
                        psFits *fits,    ///< FITS file from which to read
                        int z,           ///< Readout number/plane; zero-offset indexing
-                       psDB *db         ///< Database handle for concepts
+                       pmConfig *config ///< Configuration
     );
 
@@ -123 +125 @@
 bool pmCellReadMask(pmCell *cell,       // Cell to read into
                     psFits *fits,       // FITS file from which to read
-                    psDB *db            // Database handle, for "concepts" ingest
+                    pmConfig *config    // Configuration
                    );
 
@@ -131 +133 @@
 bool pmChipReadMask(pmChip *chip,       // Chip to read into
                     psFits *fits,       // FITS file from which to read
-                    psDB *db            // Database handle, for "concepts" ingest
+                    pmConfig *config    // Configuration
                    );
 
@@ -139 +141 @@
 bool pmFPAReadMask(pmFPA *fpa,          // FPA to read into
                    psFits *fits,        // FITS file from which to read
-                   psDB *db             // Database handle, for "concepts" ingest
+                   pmConfig *config     // Configuration
                   );
 
@@ -149 +151 @@
                          int z,         ///< Readout number/plane; zero-offset indexing
                          int numScans,  ///< Number of scans (rows/cols) to read
-                         psDB *db       ///< Database handle for concepts
+                         pmConfig *config ///< Configuration
     );
 
@@ -160 +162 @@
                               int numScans, ///< Number of scans (rows/cols) to read
                               int overlap, ///< Overlap between consecutive reads
-                              psDB *db  ///< Database handle for concepts
+                              pmConfig *config ///< Configuration
     );
 
@@ -167 +169 @@
                          psFits *fits,  ///< FITS file from which to read
                          int z,         ///< Readout number/plane; zero-offset indexing
-                         psDB *db       ///< Database handle for concepts
+                         pmConfig *config ///< Configuration
     );
 
@@ -173 +175 @@
 ///
 /// Same as pmCellRead, but reads into the weight element of the readouts.
-bool pmCellReadWeight(pmCell *cell,           // Cell to read into
-                      psFits *fits,           // FITS file from which to read
-                      psDB *db                // Database handle, for "concepts" ingest
+bool pmCellReadWeight(pmCell *cell,     // Cell to read into
+                      psFits *fits,     // FITS file from which to read
+                      pmConfig *config  // Configuration
                      );
 
@@ -181 +183 @@
 ///
 /// Same as pmChipRead, but reads into the weight element of the readouts.
-bool pmChipReadWeight(pmChip *chip,           // Chip to read into
-                      psFits *fits,           // FITS file from which to read
-                      psDB *db                // Database handle, for "concepts" ingest
+bool pmChipReadWeight(pmChip *chip,     // Chip to read into
+                      psFits *fits,     // FITS file from which to read
+                      pmConfig *config  // Configuration
                      );
 
@@ -189 +191 @@
 ///
 /// Same as pmFPARead, but reads into the weight element of the readouts.
-bool pmFPAReadWeight(pmFPA *fpa,              // FPA to read into
-                     psFits *fits,            // FITS file from which to read
-                     psDB *db                 // Database handle, for "concepts" ingest
+bool pmFPAReadWeight(pmFPA *fpa,        // FPA to read into
+                     psFits *fits,      // FITS file from which to read
+                     pmConfig *config   // Configuration
                     );
 
@@ -197 +199 @@
 ///
 /// Same as pmCellRead, but reads only the headers of the readouts.
-bool pmCellReadHeaderSet(pmCell *cell,           // Cell to read into
-                         psFits *fits,           // FITS file from which to read
-                         psDB *db                // Database handle, for "concepts" ingest
+bool pmCellReadHeaderSet(pmCell *cell,  // Cell to read into
+                         psFits *fits,  // FITS file from which to read
+                         pmConfig *config // Configuration
     );
 
@@ -205 +207 @@
 ///
 /// Same as pmChipRead, but reads only the headers of the readouts.
-bool pmChipReadHeaderSet(pmChip *chip,           // Chip to read into
-                      psFits *fits,           // FITS file from which to read
-                      psDB *db                // Database handle, for "concepts" ingest
+bool pmChipReadHeaderSet(pmChip *chip,  // Chip to read into
+                      psFits *fits,     // FITS file from which to read
+                      pmConfig *config  // Configuration
                      );
 
@@ -213 +215 @@
 ///
 /// Same as pmFPARead, but reads only the headers of the readouts.
-bool pmFPAReadHeaderSet(pmFPA *fpa,              // FPA to read into
-                        psFits *fits,            // FITS file from which to read
-                        psDB *db                 // Database handle, for "concepts" ingest
+bool pmFPAReadHeaderSet(pmFPA *fpa,     // FPA to read into
+                        psFits *fits,   // FITS file from which to read
+                        pmConfig *config // Configuration
     );
 

trunk/psModules/src/camera/pmFPAWrite.c

@@ -128 +128 @@
 static bool cellWrite(pmCell *cell,     // Cell to write
                       psFits *fits,     // FITS file to which to write
-                      psDB *db,         // Database handle for "concepts" update
+                      pmConfig *config, // Configuration
                       bool blank,       // Write a blank PHU?
                       fpaWriteType type // Type to write
@@ -178 +178 @@
 static bool chipWrite(pmChip *chip,     // Chip to write
                       psFits *fits,     // FITS file to which to write
-                      psDB *db,         // Database handle for "concepts" update
+                      pmConfig *config, // Configuration
                       bool blank,       // Write a blank PHU?
                       bool recurse,     // Recurse to lower levels?
@@ -228 +228 @@
         for (int i = 0; i < cells->n; i++) {
             pmCell *cell = cells->data[i];  // The cell of interest
-            if (!cellWrite(cell, fits, db, false, type)) {
+            if (!cellWrite(cell, fits, config, false, type)) {
                 psError(PS_ERR_IO, false, "Unable to write Chip.\n");
                 return false;
@@ -242 +242 @@
 static bool fpaWrite(pmFPA *fpa,        // FPA to write
                      psFits *fits,      // FITS file to which to write
-                     psDB *db,          // Database handle for "concepts" update
+                     pmConfig *config,  // Configuration
                      bool blank,        // Write a blank PHU?
                      bool recurse,      // Recurse to lower levels?
@@ -291 +291 @@
         for (int i = 0; i < chips->n; i++) {
             pmChip *chip = chips->data[i];  // The chip of interest
-            if (!chipWrite(chip, fits, db, false, true, type)) {
+            if (!chipWrite(chip, fits, config, false, true, type)) {
                 psError(PS_ERR_IO, false, "Unable to write FPA.\n");
                 return false;
@@ -372 +372 @@
 
 
-bool pmCellWrite(pmCell *cell, psFits *fits, psDB *db, bool blank)
+bool pmCellWrite(pmCell *cell, psFits *fits, pmConfig *config, bool blank)
 {
     PS_ASSERT_PTR_NON_NULL(cell, false);
     PS_ASSERT_PTR_NON_NULL(fits, false);
-    return cellWrite(cell, fits, db, blank, FPA_WRITE_TYPE_IMAGE);
-}
-
-bool pmChipWrite(pmChip *chip, psFits *fits, psDB *db, bool blank, bool recurse)
+    return cellWrite(cell, fits, config, blank, FPA_WRITE_TYPE_IMAGE);
+}
+
+bool pmChipWrite(pmChip *chip, psFits *fits, pmConfig *config, bool blank, bool recurse)
 {
     PS_ASSERT_PTR_NON_NULL(chip, false);
     PS_ASSERT_PTR_NON_NULL(fits, false);
-    return chipWrite(chip, fits, db, blank, recurse, FPA_WRITE_TYPE_IMAGE);
-}
-
-bool pmFPAWrite(pmFPA *fpa, psFits *fits, psDB *db, bool blank, bool recurse)
+    return chipWrite(chip, fits, config, blank, recurse, FPA_WRITE_TYPE_IMAGE);
+}
+
+bool pmFPAWrite(pmFPA *fpa, psFits *fits, pmConfig *config, bool blank, bool recurse)
 {
     PS_ASSERT_PTR_NON_NULL(fpa, false);
     PS_ASSERT_PTR_NON_NULL(fits, false);
-    return fpaWrite(fpa, fits, db, blank, recurse, FPA_WRITE_TYPE_IMAGE);
-}
-
-
-bool pmCellWriteMask(pmCell *cell, psFits *fits, psDB *db, bool blank)
+    return fpaWrite(fpa, fits, config, blank, recurse, FPA_WRITE_TYPE_IMAGE);
+}
+
+
+bool pmCellWriteMask(pmCell *cell, psFits *fits, pmConfig *config, bool blank)
 {
     PS_ASSERT_PTR_NON_NULL(cell, false);
     PS_ASSERT_PTR_NON_NULL(fits, false);
-    return cellWrite(cell, fits, db, blank, FPA_WRITE_TYPE_MASK);
-}
-
-bool pmChipWriteMask(pmChip *chip, psFits *fits, psDB *db, bool blank, bool recurse)
+    return cellWrite(cell, fits, config, blank, FPA_WRITE_TYPE_MASK);
+}
+
+bool pmChipWriteMask(pmChip *chip, psFits *fits, pmConfig *config, bool blank, bool recurse)
 {
     PS_ASSERT_PTR_NON_NULL(chip, false);
     PS_ASSERT_PTR_NON_NULL(fits, false);
-    return chipWrite(chip, fits, db, blank, recurse, FPA_WRITE_TYPE_MASK);
-}
-
-bool pmFPAWriteMask(pmFPA *fpa, psFits *fits, psDB *db, bool blank, bool recurse)
+    return chipWrite(chip, fits, config, blank, recurse, FPA_WRITE_TYPE_MASK);
+}
+
+bool pmFPAWriteMask(pmFPA *fpa, psFits *fits, pmConfig *config, bool blank, bool recurse)
 {
     PS_ASSERT_PTR_NON_NULL(fpa, false);
     PS_ASSERT_PTR_NON_NULL(fits, false);
-    return fpaWrite(fpa, fits, db, blank, recurse, FPA_WRITE_TYPE_MASK);
-}
-
-
-bool pmCellWriteWeight(pmCell *cell, psFits *fits, psDB *db, bool blank)
+    return fpaWrite(fpa, fits, config, blank, recurse, FPA_WRITE_TYPE_MASK);
+}
+
+
+bool pmCellWriteWeight(pmCell *cell, psFits *fits, pmConfig *config, bool blank)
 {
     PS_ASSERT_PTR_NON_NULL(cell, false);
     PS_ASSERT_PTR_NON_NULL(fits, false);
-    return cellWrite(cell, fits, db, blank, FPA_WRITE_TYPE_WEIGHT);
-}
-
-bool pmChipWriteWeight(pmChip *chip, psFits *fits, psDB *db, bool blank, bool recurse)
+    return cellWrite(cell, fits, config, blank, FPA_WRITE_TYPE_WEIGHT);
+}
+
+bool pmChipWriteWeight(pmChip *chip, psFits *fits, pmConfig *config, bool blank, bool recurse)
 {
     PS_ASSERT_PTR_NON_NULL(chip, false);
     PS_ASSERT_PTR_NON_NULL(fits, false);
-    return chipWrite(chip, fits, db, blank, recurse, FPA_WRITE_TYPE_WEIGHT);
-}
-
-bool pmFPAWriteWeight(pmFPA *fpa, psFits *fits, psDB *db, bool blank, bool recurse)
+    return chipWrite(chip, fits, config, blank, recurse, FPA_WRITE_TYPE_WEIGHT);
+}
+
+bool pmFPAWriteWeight(pmFPA *fpa, psFits *fits, pmConfig *config, bool blank, bool recurse)
 {
     PS_ASSERT_PTR_NON_NULL(fpa, false);
     PS_ASSERT_PTR_NON_NULL(fits, false);
-    return fpaWrite(fpa, fits, db, blank, recurse, FPA_WRITE_TYPE_WEIGHT);
+    return fpaWrite(fpa, fits, config, blank, recurse, FPA_WRITE_TYPE_WEIGHT);
 }
 

trunk/psModules/src/camera/pmFPAWrite.h

@@ -4 +4 @@
  * @author Paul Price, IfA
  *
- * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-03-31 04:17:41 $
+ * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-06-17 22:16:38 $
  * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -11 +11 @@
 #ifndef PM_FPA_WRITE_H
 #define PM_FPA_WRITE_H
+
+#include <pmConfig.h>
 
 /// @addtogroup Camera Camera Layout
@@ -32 +34 @@
 bool pmCellWrite(pmCell *cell,          ///<  Cell to write
                  psFits *fits,          ///<  FITS file to which to write
-                 psDB *db,              ///<  Database handle for "concepts" update
+                 pmConfig *config,      ///<  Configuration
                  bool blank             ///<  Write a blank PHU?
                 );
@@ -44 +46 @@
 bool pmChipWrite(pmChip *chip,          ///<  Chip to write
                  psFits *fits,          ///<  FITS file to which to write
-                 psDB *db,              ///<  Database handle for "concepts" update
+                 pmConfig *config,      ///<  Configuration
                  bool blank,            ///<  Write a blank PHU?
                  bool recurse           ///<  Recurse to lower levels?
@@ -57 +59 @@
 bool pmFPAWrite(pmFPA *fpa,             ///<  FPA to write
                 psFits *fits,           ///<  FITS file to which to write
-                psDB *db,               ///<  Database handle for "concepts" update
+                pmConfig *config,       ///<  Configuration
                 bool blank,             ///<  Write a blank PHU?
                 bool recurse            ///<  Recurse to lower levels?
@@ -70 +72 @@
 bool pmCellWriteMask(pmCell *cell,      ///<  Cell to write
                      psFits *fits,      ///<  FITS file to which to write
-                     psDB *db,          ///<  Database handle for "concepts" update
+                     pmConfig *config,  ///<  Configuration
                      bool blank         ///<  Write a blank PHU?
                     );
@@ -83 +85 @@
 bool pmChipWriteMask(pmChip *chip,      ///<  Chip to write
                      psFits *fits,      ///<  FITS file to which to write
-                     psDB *db,          ///<  Database handle for "concepts" update
+                     pmConfig *config,  ///<  Configuration
                      bool blank,        ///<  Write a blank PHU?
                      bool recurse       ///<  Recurse to lower levels?
@@ -97 +99 @@
 bool pmFPAWriteMask(pmFPA *fpa,         ///<  FPA to write
                     psFits *fits,       ///<  FITS file to which to write
-                    psDB *db,           ///<  Database handle for "concepts" update
+                    pmConfig *config,   ///<  Configuration
                     bool blank,         ///<  Write a blank PHU?
                     bool recurse        ///<  Recurse to lower levels?
@@ -110 +112 @@
 bool pmCellWriteWeight(pmCell *cell,    ///<  Cell to write
                        psFits *fits,    ///<  FITS file to which to write
-                       psDB *db,        ///<  Database handle for "concepts" update
+                       pmConfig *config, ///<  Configuration
                        bool blank       ///<  Write a blank PHU?
                       );
@@ -123 +125 @@
 bool pmChipWriteWeight(pmChip *chip,    ///<  Chip to write
                        psFits *fits,    ///<  FITS file to which to write
-                       psDB *db,        ///<  Database handle for "concepts" update
+                       pmConfig *config, ///<  Configuration
                        bool blank,      ///<  Write a blank PHU?
                        bool recurse     ///<  Recurse to lower levels?
@@ -137 +139 @@
 bool pmFPAWriteWeight(pmFPA *fpa,       ///<  FPA to write
                       psFits *fits,     ///<  FITS file to which to write
-                      psDB *db,         ///<  Database handle for "concepts" update
+                      pmConfig *config, ///<  Configuration
                       bool blank,       ///<  Write a blank PHU?
                       bool recurse      ///<  Recurse to lower levels?

trunk/psModules/src/camera/pmFPAfileFitsIO.c

@@ -166 +166 @@
 static bool fpaViewReadFitsImage(const pmFPAview *view, // FPA view, specifying the level of interest
                                  pmFPAfile *file, // FPA file of interest
-                                 psDB *db, 
-                                 bool (*fpaReadFunc)(pmFPA*, psFits*, psDB*), // Function to read FPA
-                                 bool (*chipReadFunc)(pmChip*, psFits*, psDB*), // Function to read chip
-                                 bool (*cellReadFunc)(pmCell*, psFits*, psDB*) // Function to read cell
+                                 pmConfig *config, // Configuration
+                                 bool (*fpaReadFunc)(pmFPA*, psFits*, pmConfig*), // Function to read FPA
+                                 bool (*chipReadFunc)(pmChip*, psFits*, pmConfig*), // Function to read chip
+                                 bool (*cellReadFunc)(pmCell*, psFits*, pmConfig*) // Function to read cell
                                 )
 {
@@ -179 +179 @@
 
     if (view->chip == -1) {
-        return fpaReadFunc(fpa, fits, db);
+        return fpaReadFunc(fpa, fits, config);
     }
 
@@ -189 +189 @@
 
     if (view->cell == -1) {
-        return chipReadFunc(chip, fits, db);
+        return chipReadFunc(chip, fits, config);
     }
 
@@ -199 +199 @@
 
     if (view->readout == -1) {
-        return cellReadFunc(cell, fits, db);
+        return cellReadFunc(cell, fits, config);
     }
     psError(PS_ERR_UNKNOWN, true, "Bad view: %d,%d", view->chip, view->cell);
@@ -215 +215 @@
 
     if (view->nRows == 0) {
-        pmReadoutRead (readout, fits, db);
+        pmReadoutRead (readout, fits, config);
     } else {
         pmReadoutReadSegment (readout, fits, view->nRows, view->iRows, NULL, NULL);
@@ -228 +228 @@
     PS_ASSERT_PTR_NON_NULL(view, false);
     PS_ASSERT_PTR_NON_NULL(file, false);
-    return fpaViewReadFitsImage(view, file, config->database, pmFPARead, pmChipRead, pmCellRead);
+    return fpaViewReadFitsImage(view, file, config, pmFPARead, pmChipRead, pmCellRead);
 }
 
@@ -235 +235 @@
     PS_ASSERT_PTR_NON_NULL(view, false);
     PS_ASSERT_PTR_NON_NULL(file, false);
-    return fpaViewReadFitsImage(view, file, config->database, pmFPAReadMask, pmChipReadMask, pmCellReadMask);
+    return fpaViewReadFitsImage(view, file, config, pmFPAReadMask, pmChipReadMask, pmCellReadMask);
 }
 
@@ -242 +242 @@
     PS_ASSERT_PTR_NON_NULL(view, false);
     PS_ASSERT_PTR_NON_NULL(file, false);
-    return fpaViewReadFitsImage(view, file, config->database, pmFPAReadWeight, pmChipReadWeight, pmCellReadWeight);
+    return fpaViewReadFitsImage(view, file, config, pmFPAReadWeight, pmChipReadWeight, pmCellReadWeight);
 }
 
@@ -249 +249 @@
     PS_ASSERT_PTR_NON_NULL(view, false);
     PS_ASSERT_PTR_NON_NULL(file, false);
-    return fpaViewReadFitsImage(view, file, config->database, pmFPAReadDark, pmChipReadDark, pmCellReadDark);
+    return fpaViewReadFitsImage(view, file, config, pmFPAReadDark, pmChipReadDark, pmCellReadDark);
 }
 
@@ -256 +256 @@
     PS_ASSERT_PTR_NON_NULL(view, false);
     PS_ASSERT_PTR_NON_NULL(file, false);
-    return fpaViewReadFitsImage(view, file, config->database, pmFPAReadHeaderSet, pmChipReadHeaderSet, pmCellReadHeaderSet);
+    return fpaViewReadFitsImage(view, file, config, pmFPAReadHeaderSet, pmChipReadHeaderSet, pmCellReadHeaderSet);
 }
 
@@ -267 +267 @@
 static bool fpaViewWriteFitsImage(const pmFPAview *view, // FPA view, specifying the level of interest
                                   pmFPAfile *file, // FPA file of interest
-                                  const pmConfig *config, // Configuration
-                                  bool (*fpaWriteFunc)(pmFPA*, psFits*, psDB*, bool, bool), // Func for FPA
-                                  bool (*chipWriteFunc)(pmChip*, psFits*, psDB*, bool, bool), // Func for chip
-                                  bool (*cellWriteFunc)(pmCell*, psFits*, psDB*, bool) // Func for cell
+                                  pmConfig *config, // Configuration
+                                  bool (*fpaWriteFunc)(pmFPA*, psFits*, pmConfig*, bool, bool), // Func FPA
+                                  bool (*chipWriteFunc)(pmChip*, psFits*, pmConfig*, bool, bool),// Func chip
+                                  bool (*cellWriteFunc)(pmCell*, psFits*, pmConfig*, bool) // Func cell
                                  )
 {
@@ -283 +283 @@
     switch (pmFPAviewLevel(view)) {
     case PM_FPA_LEVEL_FPA: {
-            bool success = fpaWriteFunc(fpa, fits, NULL, false, true);
+            bool success = fpaWriteFunc(fpa, fits, config, false, true);
             psFree(fpa);
             return success;
@@ -289 +289 @@
     case PM_FPA_LEVEL_CHIP: {
             pmChip *chip = pmFPAviewThisChip(view, fpa); // Chip of interest
-            bool success = chipWriteFunc(chip, fits, NULL, false, true);
+            bool success = chipWriteFunc(chip, fits, config, false, true);
             psFree(fpa);
             return success;
@@ -295 +295 @@
     case PM_FPA_LEVEL_CELL: {
             pmCell *cell = pmFPAviewThisCell(view, fpa); // Cell of interest
-            bool success = cellWriteFunc(cell, fits, NULL, false);
+            bool success = cellWriteFunc(cell, fits, config, false);
             psFree(fpa);
             return success;
@@ -327 +327 @@
 }
 
-bool pmFPAviewWriteFitsImage(const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
+bool pmFPAviewWriteFitsImage(const pmFPAview *view, pmFPAfile *file, pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(view, false);
@@ -334 +334 @@
 }
 
-bool pmFPAviewWriteFitsMask(const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
+bool pmFPAviewWriteFitsMask(const pmFPAview *view, pmFPAfile *file, pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(view, false);
@@ -341 +341 @@
 }
 
-bool pmFPAviewWriteFitsWeight(const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
+bool pmFPAviewWriteFitsWeight(const pmFPAview *view, pmFPAfile *file, pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(view, false);
@@ -348 +348 @@
 }
 
-bool pmFPAviewWriteFitsDark(const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
+bool pmFPAviewWriteFitsDark(const pmFPAview *view, pmFPAfile *file, pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(view, false);

trunk/psModules/src/camera/pmFPAfileFitsIO.h

@@ -5 +5 @@
  * @author PAP, IfA
  *
- * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-06-14 03:19:31 $
+ * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-06-17 22:16:38 $
  * Copyright 2004-2005 Institute for Astronomy, University of Hawaii
  */
@@ -19 +19 @@
 bool pmFPAviewReadFitsImage(const pmFPAview *view, ///< View specifying level of interest
                             pmFPAfile *file, ///< FPA file into which to read
-                            pmConfig *config
+                            pmConfig *config
                            );
 
@@ -25 +25 @@
 bool pmFPAviewReadFitsMask(const pmFPAview *view, ///< View specifying level of interest
                            pmFPAfile *file, ///< FPA file into which to read
-                            pmConfig *config
+                            pmConfig *config
                           );
 /// Read a weight map into the current view
 bool pmFPAviewReadFitsWeight(const pmFPAview *view,  ///< View specifying level of interest
                              pmFPAfile *file, ///< FPA file into which to read
-                            pmConfig *config
+                            pmConfig *config
                             );
 
@@ -36 +36 @@
 bool pmFPAviewReadFitsDark(const pmFPAview *view,  ///< View specifying level of interest
                            pmFPAfile *file, ///< FPA file into which to read
-                            pmConfig *config
+                            pmConfig *config
     );
 
@@ -42 +42 @@
 bool pmFPAviewReadFitsHeaderSet(const pmFPAview *view,  ///< View specifying level of interest
                                 pmFPAfile *file, ///< FPA file into which to read
-                            pmConfig *config
+                            pmConfig *config
     );
 
@@ -48 +48 @@
 bool pmFPAviewWriteFitsImage(const pmFPAview *view, ///< View specifying level of interest
                              pmFPAfile *file, ///< FPA file to write
-                             const pmConfig *config ///< Configuration
+                             pmConfig *config ///< Configuration
                             );
 
@@ -54 +54 @@
 bool pmFPAviewWriteFitsMask(const pmFPAview *view, ///< View specifying level of interest
                             pmFPAfile *file, ///< FPA file to write
-                            const pmConfig *config ///< Configuration
+                            pmConfig *config ///< Configuration
                            );
 
@@ -60 +60 @@
 bool pmFPAviewWriteFitsWeight(const pmFPAview *view, ///< View specifying level of interest
                               pmFPAfile *file, ///< FPA file to write
-                              const pmConfig *config ///< Configuration
+                              pmConfig *config ///< Configuration
                              );
 
@@ -66 +66 @@
 bool pmFPAviewWriteFitsDark(const pmFPAview *view, ///< View specifying level of interest
                             pmFPAfile *file, ///< FPA file to write
-                            const pmConfig *config ///< Configuration
+                            pmConfig *config ///< Configuration
     );