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

Timestamp:

Jan 8, 2007, 12:26:06 PM (19 years ago)

Author:

Paul Price

Message:

Adding facilities to automatically generate mosaicked versions of cameras on the fly. To support this, changed the configuration system to load the camera config and camera format configs so that these remain in memory (replacing the filename with the psMetadata that results from reading the file). New mosaicked cameras have the names _CAMERA-CHIP and _CAMERA-FPA for an unmosaicked camera named CAMERA. These are placed at the top of the camera list, so that they are compared first against FITS headers. pmConfigCameraFormatFromHeader still outputs a warning if called on the header from a mosaicked camera, because the unmosaicked version also matches (the addition of a header, rather than changing a header means that something without that header in the RULE also matches).

File:

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

trunk/psModules/src/config/pmConfig.h

@@ -9 +9 @@
 /// @author Eugene Magnier, IfA
 ///
-/// @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2006-12-11 20:59:48 $
+/// @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
+/// @date $Date: 2007-01-08 22:26:06 $
 ///
 /// Copyright 2005-2006 Institute for Astronomy, University of Hawaii
@@ -42 +42 @@
     psMetadata *site;                   ///< Site configuration
     psMetadata *camera;                 ///< Camera specification
-    const char *cameraName;             ///< Camera name
+    psString cameraName;                ///< Camera name
+    psMetadata *format;                 ///< Camera format description
+    psString formatName;                ///< Camera format name
     psMetadata *recipes;                ///< Recipes for processing
     psMetadata *arguments;              ///< Processed command-line arguments
@@ -49 +51 @@
     int *argc;                          ///< Number of command-line arguments
     char **argv;                        ///< Command-line arguments (raw version)
-    char *defaultRecipe;  ///< name of top-level recipe for this program
+    const char *defaultRecipe;          ///< name of top-level recipe for this program
     // Private members
-    pmRecipeSource recipesRead;  ///< Which recipe sources have been read
+    pmRecipeSource recipesRead;         ///< Which recipe sources have been read
     psMetadata *recipeSymbols;          ///< Where each recipe came from
 }