Changeset 18163 for trunk/psModules/src/camera/pmFPAHeader.c

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.

File:

• trunk/psModules/src/camera/pmFPAHeader.c (modified) (7 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;