Changeset 6553 for branches/rel10_ifa/psModules/src/config/pmConfig.h

Timestamp:

Mar 8, 2006, 5:09:28 PM (20 years ago)

Author:

Paul Price

Message:

Modified the camera configuration to use camera config (components of the camera) and format descriptions (FITS file layout).

File:

• branches/rel10_ifa/psModules/src/config/pmConfig.h (modified) (3 diffs)

branches/rel10_ifa/psModules/src/config/pmConfig.h

@@ -3 +3 @@
  *  @author PAP, IfA
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-02-02 04:51:14 $
+ *  @version $Revision: 1.3.4.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-03-09 03:09:28 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -15 +15 @@
 
 
+// Configuration information
+typedef struct
+{
+    psMetadata *site;                   // Site configuration
+    psMetadata *camera;                 // Camera specification
+    psMetadata *recipe;                 // Recipe for processing
+    psMetadata *arguments;              // Command-line arguments
+    psDB *database;                     // Database handle
+}
+pmConfig;
+
+pmConfig *pmConfigAlloc(void);
 
 /** pmConfigRead
- * 
+ *
  * pmConfigRead shall load the site configuration (according to the above rule
  * for determining the source). The camera configuration shall also be loaded if
@@ -32 +44 @@
  *
  */
-bool pmConfigRead(
-    psMetadata **site,
-    psMetadata **camera,
-    psMetadata **recipe,
+pmConfig *pmConfigRead(
     int *argc,
     char **argv,
-    const char *recipeName
-);
-
+    const char *recipeName);
 
 
 /** pmConfigValidateCamera
- * 
+ *
  * This function, used by pmConfigCameraFromHeader, shall return true if the
  * FITS header matches the rule contained in the camera configuration (see
  * x2.2.2.3); otherwise it shall return false.
- * 
+ *
  */
-bool pmConfigValidateCamera(
-    const psMetadata *camera,
-    const psMetadata *header
-);
-
+bool pmConfigValidateCameraFormat(
+    const psMetadata *cameraFormat,
+    const psMetadata *header);
 
 
 /** pmConfigCameraFromHeader
- * 
+ *
  * pmConfigCameraFromHeader shall load the camera configuration based on the
  * contents of the FITS header, using the list of known cameras contained in the
  * site configuration. If more than one camera matches the FITS header, a warning
  * shall be generated and the first matching camera returned.
- * 
+ *
  */
-psMetadata *pmConfigCameraFromHeader(
-    const psMetadata *site,
-    const psMetadata *header
+psMetadata *pmConfigCameraFormatFromHeader(
+    pmConfig *config,                   // The configuration
+    const psMetadata *header           // The FITS header
 );
 
 
-
 /** pmConfigRecipeFromCamera
- * 
+ *
  * pmConfigRecipeFromCamera shall load the recipe configuration based on the
- * recipeName and the list of known recipes contained in the camera 
+ * recipeName and the list of known recipes contained in the camera
  * configuration.
- * 
+ *
  */
-psMetadata *pmConfigRecipeFromCamera(
-    const psMetadata *camera,
+bool pmConfigRecipeFromCamera(
+    pmConfig *config,
     const char *recipeName
 );
 
 /** pmConfigDB
- * 
+ *
  * pmConfigDB shall use the site configuration data to open a database handle.
  * This is fairly straightforward at the moment, but will change when we beef up
  * security. (TBD)
- * 
+ *
  */
 #ifdef DOMIT_PSDB