Changeset 18650

Timestamp:

Jul 21, 2008, 3:29:19 PM (18 years ago)

Author:

Paul Price

Message:

Must parse arguments after defining a camera; otherwise can't get camera-dependent recipe values.

Location:

trunk/ppStack/src

Files:

• ppStack.c (modified) (2 diffs)
• ppStack.h (modified) (1 diff)
• ppStackArguments.c (modified) (8 diffs)

trunk/ppStack/src/ppStack.c

@@ -26 +26 @@
     (void) psTraceSetLevel("ppStack", 5);
 
-    if (!ppStackArguments(argc, argv, config)) {
+    if (!ppStackArgumentsSetup(argc, argv, config)) {
         psErrorStackPrint(stderr, "Error reading arguments.\n");
         exitValue = PS_EXIT_CONFIG_ERROR;
@@ -40 +40 @@
     if (!ppStackCamera(config)) {
         psErrorStackPrint(stderr, "Error setting up input files.\n");
+        exitValue = PS_EXIT_CONFIG_ERROR;
+        goto die;
+    }
+
+    if (!ppStackArgumentsParse(config)) {
+        psErrorStackPrint(stderr, "Error reading arguments.\n");
         exitValue = PS_EXIT_CONFIG_ERROR;
         goto die;

trunk/ppStack/src/ppStack.h

@@ -7 +7 @@
 #include <psmodules.h>
 
+// Setup command-line arguments
+bool ppStackArgumentsSetup(int argc, char *argv[], // Command-line arguments
+                           pmConfig *config  // Configuration
+    );
+
 // Parse command-line arguments
-bool ppStackArguments(int argc, char *argv[], // Command-line arguments
-                      pmConfig *config  // Configuration
+bool ppStackArgumentsParse(pmConfig *config  // Configuration
     );
 

trunk/ppStack/src/ppStackArguments.c

@@ -40 +40 @@
 // Get a float-point value from the command-line or recipe, and add it to the arguments
 #define VALUE_ARG_RECIPE_FLOAT(ARGNAME, RECIPENAME, TYPE) { \
-    ps##TYPE value = psMetadataLookup##TYPE(NULL, arguments, ARGNAME); \
+    ps##TYPE value = psMetadataLookup##TYPE(NULL, config->arguments, ARGNAME); \
     if (isnan(value)) { \
         bool mdok; \
@@ -55 +55 @@
 // Get an integer value from the command-line or recipe, and add it to the arguments
 #define VALUE_ARG_RECIPE_INT(ARGNAME, RECIPENAME, TYPE, UNSET) { \
-    ps##TYPE value = psMetadataLookup##TYPE(NULL, arguments, ARGNAME); \
+    ps##TYPE value = psMetadataLookup##TYPE(NULL, config->arguments, ARGNAME); \
     if (value == UNSET) { \
         bool mdok; \
@@ -71 +71 @@
 #define VALUE_ARG_RECIPE_MASK(ARGNAME, RECIPENAME) { \
     bool mdok; \
-    const char *name = psMetadataLookupStr(&mdok, arguments, ARGNAME); \
+    const char *name = psMetadataLookupStr(&mdok, config->arguments, ARGNAME); \
     if (!mdok || !name || strlen(name) == 0) { \
         name = psMetadataLookupStr(NULL, recipe, RECIPENAME); \
@@ -86 +86 @@
 // Get a statistic name from the command-line or recipe, and add the enum to the arguments
 #define VALUE_ARG_RECIPE_STAT(ARGNAME, RECIPENAME) { \
-    const char *stat = psMetadataLookupStr(NULL, arguments, ARGNAME); \
+    const char *stat = psMetadataLookupStr(NULL, config->arguments, ARGNAME); \
     if (!stat) { \
         stat = psMetadataLookupStr(NULL, recipe, RECIPENAME); \
@@ -132 +132 @@
 }
 
-bool ppStackArguments(int argc, char *argv[], pmConfig *config)
+bool ppStackArgumentsSetup(int argc, char *argv[], pmConfig *config)
 {
     assert(config);
@@ -139 +139 @@
     pmConfigFileSetsMD(config->arguments, &argc, argv, "PPSTACK.SOURCES", "-sources", NULL);
 
-    psMetadata *arguments = psMetadataAlloc(); // Command-line arguments
+    psMetadata *arguments = config->arguments; // Command-line arguments
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-stamps", 0, "Stamps file with x,y,flux per line", NULL);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-stats", 0, "Statistics file", NULL);
@@ -184 +184 @@
     if (!inputs || numBad > 0) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Unable to cleanly read MDC file with inputs.");
-        goto ERROR;
+        return false;
     }
     psMetadataAddMetadata(config->arguments, PS_LIST_TAIL, "INPUTS", 0,
@@ -193 +193 @@
 
     valueArgStr(arguments, "-stats", "STATS", config->arguments);
+
+    return true;
+}
+
+bool ppStackArgumentsParse(pmConfig *config)
+{
+    assert(config);
+
+    psMetadata *arguments = config->arguments; // Command-line arguments
 
     psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PPSTACK_RECIPE); // Recipe for ppSim