Changeset 10438

Timestamp:

Dec 4, 2006, 11:45:54 AM (20 years ago)

Author:

eugene

Message:

updated to new pmConfigRead, added PSASTRO_RECIPE, new option lookup

Location:

trunk/psastro/src

Files:

• psastro.h (modified) (1 diff)
• psastroArguments.c (modified) (3 diffs)
• psastroAstromGuess.c (modified) (1 diff)
• psastroChipAstrom.c (modified) (1 diff)
• psastroChooseRefstars.c (modified) (1 diff)
• psastroDataLoad.c (modified) (1 diff)
• psastroDataSave.c (modified) (1 diff)
• psastroLoadRefstars.c (modified) (1 diff)
• psastroMosaicAstrom.c (modified) (1 diff)
• psastroMosaicHeaders.c (modified) (1 diff)
• psastroParseCamera.c (modified) (1 diff)

trunk/psastro/src/psastro.h

@@ -11 +11 @@
 
 # include "psastroErrorCodes.h"
+#define PSASTRO_RECIPE "PSASTRO" // Name of the recipe to use
 
 # define psMemCopy(A)(psMemIncrRefCounter((A)))

trunk/psastro/src/psastroArguments.c

@@ -15 +15 @@
     psLogSetFormat ("M");
 
-    // these other options override the PSASTRO recipe options
-    psMetadata *options = psMetadataAlloc ();
+    // load config data from default locations
+    pmConfig *config = pmConfigRead(&argc, argv, PSASTRO_RECIPE);
+    if (config == NULL) {
+        psError(PSASTRO_ERR_CONFIG, false, "Can't read site configuration");
+        return NULL;
+    }
+
+    // save the following additional recipe values based on command-line options
+    // these options override the PSPHOT recipe values loaded from recipe files
+    psMetadata *options = pmConfigRecipeOptions (config, PSASTRO_RECIPE);
 
     // photcode : used in output to supplement header data (argument or recipe?)
@@ -24 +32 @@
         psArgumentRemove (N, &argc, argv);
     }
-
-    // load config data from default locations
-    pmConfig *config = pmConfigRead(&argc, argv);
-    if (config == NULL) {
-        psError(PSASTRO_ERR_CONFIG, false, "Can't read site configuration");
-        return NULL;
-    }
-
-    // save these recipe options until we have loaded the options
-    psMetadataAddPtr (config->arguments, PS_LIST_TAIL, "PSASTRO.OPTIONS",  PS_DATA_METADATA, "", options);
-    psFree (options);
 
     // chip selection is used to limit chips to be processed
@@ -49 +46 @@
         psArgumentRemove (N, &argc, argv);
     }
+
+    // drop the local view on the options (saved in config->arguments)
+    psFree (options);
 
     status = pmConfigFileSetsMD (config->arguments, config, "INPUT", "-file", "-list");

trunk/psastro/src/psastroAstromGuess.c

@@ -28 +28 @@
 
     // select the current recipe
-    psMetadata *recipe  = psMetadataLookupPtr (NULL, config->recipes, "PSASTRO");
+    psMetadata *recipe  = psMetadataLookupPtr (NULL, config->recipes, PSASTRO_RECIPE);
     if (!recipe) {
         psError(PSASTRO_ERR_CONFIG, true, "Can't find PSASTRO recipe!");

trunk/psastro/src/psastroChipAstrom.c

@@ -9 +9 @@
 
     // select the current recipe
-    psMetadata *recipe  = psMetadataLookupPtr (NULL, config->recipes, "PSASTRO");
+    psMetadata *recipe  = psMetadataLookupPtr (NULL, config->recipes, PSASTRO_RECIPE);
     if (!recipe) {
         psError(PSASTRO_ERR_CONFIG, true, "Can't find PSASTRO recipe");

trunk/psastro/src/psastroChooseRefstars.c

@@ -9 +9 @@
 
     // select the current recipe
-    psMetadata *recipe  = psMetadataLookupPtr (NULL, config->recipes, "PSASTRO");
+    psMetadata *recipe  = psMetadataLookupPtr (NULL, config->recipes, PSASTRO_RECIPE);
     if (!recipe) {
         psError(PSASTRO_ERR_CONFIG, true, "Can't find PSASTRO recipe!\n");

trunk/psastro/src/psastroDataLoad.c

@@ -13 +13 @@
 
     // select the current recipe
-    psMetadata *recipe  = psMetadataLookupPtr (NULL, config->recipes, "PSASTRO");
+    psMetadata *recipe  = psMetadataLookupPtr (NULL, config->recipes, PSASTRO_RECIPE);
     if (!recipe) {
         psError(PSASTRO_ERR_CONFIG, true, "Can't find PSASTRO recipe!\n");

trunk/psastro/src/psastroDataSave.c

@@ -10 +10 @@
 
     // select the current recipe
-    psMetadata *recipe  = psMetadataLookupPtr (NULL, config->recipes, "PSASTRO");
+    psMetadata *recipe  = psMetadataLookupPtr (NULL, config->recipes, PSASTRO_RECIPE);
     if (!recipe) {
         psError(PSASTRO_ERR_CONFIG, true, "Can't find PSASTRO recipe!\n");

trunk/psastro/src/psastroLoadRefstars.c

@@ -13 +13 @@
 
     // select the current recipe
-    psMetadata *recipe  = psMetadataLookupPtr (NULL, config->recipes, "PSASTRO");
+    psMetadata *recipe  = psMetadataLookupPtr (NULL, config->recipes, PSASTRO_RECIPE);
 
     // DVO APIs expect decimal degrees

trunk/psastro/src/psastroMosaicAstrom.c

@@ -7 +7 @@
 
     // select the current recipe
-    psMetadata *recipe  = psMetadataLookupPtr (NULL, config->recipes, "PSASTRO");
+    psMetadata *recipe  = psMetadataLookupPtr (NULL, config->recipes, PSASTRO_RECIPE);
     if (!recipe) {
         psError(PSASTRO_ERR_CONFIG, true, "Can't find PSASTRO recipe!\n");

trunk/psastro/src/psastroMosaicHeaders.c

@@ -7 +7 @@
 
     // select the current recipe
-    psMetadata *recipe  = psMetadataLookupPtr (NULL, config->recipes, "PSASTRO");
+    psMetadata *recipe  = psMetadataLookupPtr (NULL, config->recipes, PSASTRO_RECIPE);
     if (!recipe) {
         psError(PSASTRO_ERR_CONFIG, true, "Can't find PSASTRO recipe!\n");

trunk/psastro/src/psastroParseCamera.c

@@ -13 +13 @@
 
     // select recipe options supplied on command line
-    psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes,   "PSASTRO");
-    psMetadata *options = psMetadataLookupPtr (&status, config->arguments, "PSASTRO.OPTIONS");
-    psMetadataCopy (recipe, options);
+    psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, PSASTRO_RECIPE);
 
     // set default recipe values here