Changeset 10437

Timestamp:

Dec 4, 2006, 11:45:37 AM (19 years ago)

Author:

eugene

Message:

updated to new pmConfigRead, added PSPHOT_RECIPE, new option lookup

Location:

trunk/psphot/src

Files:

• psphot.h (modified) (1 diff)
• psphotArguments.c (modified) (3 diffs)
• psphotImageMedian.c (modified) (1 diff)
• psphotParseCamera.c (modified) (1 diff)
• psphotReadout.c (modified) (1 diff)

trunk/psphot/src/psphot.h

@@ -10 +10 @@
 
 # include "psphotErrorCodes.h"
+#define PSPHOT_RECIPE "PSPHOT" // Name of the recipe to use
 
 // top-level psphot functions

trunk/psphot/src/psphotArguments.c

@@ -13 +13 @@
 
     // load config data from default locations
-    pmConfig *config = pmConfigRead(&argc, argv, "PSPHOT");
+    pmConfig *config = pmConfigRead(&argc, argv, PSPHOT_RECIPE);
     if (config == NULL) {
         psError(PSPHOT_ERR_CONFIG, false, "Can't read site configuration");
@@ -21 +21 @@
     // save the following additional recipe values based on command-line options
     // these options override the PSPHOT recipe values loaded from recipe files
-
-    // if the recipe is already defined in config->arguments, supplement
-    // save the recipe options onto config->arguments:RECIPES
-    psMetadata *recipes = psMetadataLookupMetadata(NULL, config->arguments, "RECIPES");
-    if (!recipes) {
-        recipes = psMetadataAlloc ();
-        psMetadataAddPtr (config->arguments, PS_LIST_TAIL, "RECIPES",  PS_DATA_METADATA, "", recipes);
-    } else {
-        psMemIncrRefCounter (recipes); // so we can free options below if not allocated here
-    }
-    // look for the recipe defined in recipes
-    psMetadata *options = psMetadataLookupMetadata(NULL, recipes, "PSPHOT");
-    if (!options) {
-        options = psMetadataAlloc ();
-        psMetadataAddPtr (recipes, PS_LIST_TAIL, "PSPHOT",  PS_DATA_METADATA, "", options);
-    } else {
-        psMemIncrRefCounter (options); // so we can free options below if not allocated here
-    }
+    psMetadata *options = pmConfigRecipeOptions (config, PSPHOT_RECIPE);
 
     // run the test model (requires X,Y coordinate)
@@ -100 +83 @@
     // drop the local view on the options (saved in config->arguments)
     psFree (options);
-    psFree (recipes);
 
     // the input file is a required argument; if not found, we will exit

trunk/psphot/src/psphotImageMedian.c

@@ -19 +19 @@
 
     // select the appropriate recipe information
-    psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, "PSPHOT");
+    psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, PSPHOT_RECIPE);
 
     // user supplied seed, if available

trunk/psphot/src/psphotParseCamera.c

@@ -14 +14 @@
 
     // select recipe options supplied on command line
-    psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, "PSPHOT");
+    psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, PSPHOT_RECIPE);
 
     // set default recipe values here

trunk/psphot/src/psphotReadout.c

@@ -4 +4 @@
 
     // select the current recipe
-    psMetadata *recipe  = psMetadataLookupPtr (NULL, config->recipes, "PSPHOT");
+    psMetadata *recipe  = psMetadataLookupPtr (NULL, config->recipes, PSPHOT_RECIPE);
 
     // find the currently selected readout