Changeset 18136

Timestamp:

Jun 13, 2008, 3:52:05 PM (18 years ago)

Author:

eugene

Message:

adding elements to APIs to pass the db handle around

Location:

branches/eam_branch_20080613/psModules/src/camera

Files:

• pmFPAHeader.c (modified) (5 diffs)
• pmFPAHeader.h (modified) (4 diffs)

branches/eam_branch_20080613/psModules/src/camera/pmFPAHeader.c

@@ -17 +17 @@
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-bool pmCellReadHeader(pmCell *cell, psFits *fits)
+bool pmCellReadHeader(pmCell *cell, psFits *fits, pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(cell, false);
@@ -30 +30 @@
     }
 
-    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, config->database);
 }
 
 
-bool pmChipReadHeader(pmChip *chip, psFits *fits)
+bool pmChipReadHeader(pmChip *chip, psFits *fits, pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(chip, false);
@@ -47 +47 @@
     }
 
-    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, config->database)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to read concepts for chip.\n");
         return false;
@@ -56 +56 @@
 
 
-bool pmFPAReadHeader(pmFPA *fpa, psFits *fits)
+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, NULL)) {
+    if (!pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_DATABASE, true, config->database)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to read concepts for FPA.\n");
         return false;

branches/eam_branch_20080613/psModules/src/camera/pmFPAHeader.h

@@ -4 +4 @@
  *  @author Paul Price, IfA
  * 
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-24 02:54:14 $
+ *  @version $Revision: 1.3.42.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-06-14 01:52:05 $
  *  Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -20 +20 @@
 /// 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
+                     pmConfig *config
                     );
 
@@ -28 +29 @@
 /// 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
+                     pmConfig *config
                      );
 
@@ -36 +38 @@
 /// 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
+                     pmConfig *config
                      );
 /// @}