Changeset 15217 for trunk/psModules/src/config/pmConfig.h

Timestamp:

Oct 4, 2007, 10:15:48 AM (19 years ago)

Author:

Paul Price

Message:

Gene pointed out that the file rules are also read in pmConfig (when the '-F' switch is used on the command-line), and the new ability to read file rules from a separate file wasn't implemented there. I've moved the function that gets a file rule from pmFPAfileDefine.c to pmConfig.c (now named pmConfigFileRule), and now both the pmConfig and pmFPAfileDefine functions use this.

File:

• trunk/psModules/src/config/pmConfig.h (modified) (4 diffs)

trunk/psModules/src/config/pmConfig.h

@@ -1 +1 @@
 /*  @file pmConfig.h
  *  @brief Configuration functions
- * 
+ *
  *  @author Paul Price, IfA
  *  @author Eugene Magnier, IfA
- * 
- *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-04-19 02:10:12 $
+ *
+ *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-10-04 20:15:48 $
  *  Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -56 +56 @@
     int *argc;                          ///< Number of command-line arguments
     char **argv;                        ///< Command-line arguments (raw version)
-    # endif 
+    # endif
 }
 pmConfig;
@@ -110 +110 @@
 /// configuration.  The accepted format is returned.
 psMetadata *pmConfigCameraFormatFromHeader(pmConfig *config, ///< The configuration
-                                           const psMetadata *header, ///< The FITS header
-                                           bool readRecipes ///< optionally read the recipes as well as the format
+                                           const psMetadata *header, ///< The FITS header
+                                           bool readRecipes ///< optionally read the recipes as well as the format
     );
 
@@ -170 +170 @@
                           );
 
+/// Get the file rule of interest
+///
+/// Look up the name of the set of file rules to use, get that set from the site configuration, and return the
+/// appropriate rule from the set.
+psMetadata *pmConfigFileRule(const pmConfig *config, ///< Configuration
+                             const psMetadata *camera, ///< Camera configuration of interest
+                             const char *name ///< Name of rule to read
+    );
+
 /// @}
 #endif