Changeset 7519

Timestamp:

Jun 11, 2006, 11:07:09 AM (20 years ago)

Author:

eugene

Message:

sequence re-order to make code clearer

File:

• trunk/psphot/src/psphotArguments.c (modified) (3 diffs)

trunk/psphot/src/psphotArguments.c

@@ -12 +12 @@
     }
 
-    // these other options override the PSPHOT recipe options
+    // load config data from default locations 
+    pmConfig *config = pmConfigRead(argc, argv);
+    if (config == NULL) {
+        psError(PSPHOT_ERR_CONFIG, false, "Can't find site configuration");
+        return NULL;
+    }
+
+    // Storage for other command-line arguments
+    config->arguments = psMetadataAlloc ();
+
+    // save the recipe options separately until we have loaded the recipe (psphotParseDetrend)
     psMetadata *options = psMetadataAlloc ();
+    psMetadataAddPtr (config->arguments, PS_LIST_TAIL, "PSPHOT.OPTIONS",  PS_DATA_METADATA, "", options);
+
+    // the following options override the PSPHOT recipe options
 
     // run the test model (requires X,Y coordinate)
@@ -96 +109 @@
         psArgumentRemove (N, argc, argv);
     }
-
-    // load config data from default locations 
-    pmConfig *config = pmConfigRead(argc, argv);
-
-    if (config == NULL) {
-        psError(PSPHOT_ERR_CONFIG, false, "pmConfigRead returns NULL");
-        psFree(options);
-        return NULL;
-    }
-
-    // Storage for other command-line arguments
-    config->arguments = psMetadataAlloc ();
-
-    // save these recipe options until we have loaded the options
-    psMetadataAddPtr (config->arguments, PS_LIST_TAIL, "PSPHOT.OPTIONS",  PS_DATA_METADATA, "", options);
+    
+    // drop the local view on the options (saved on config->arguments)
     psFree (options);
-
-    // chip selection is used to limit chips to be processed
-    if ((N = psArgumentGet (*argc, argv, "-chip"))) {
-        psArgumentRemove (N, argc, argv);
-        psMetadataAddStr (config->arguments, PS_LIST_TAIL, "CHIP_SELECTION", PS_DATA_STRING, "", psStringCopy(argv[N]));
-        psArgumentRemove (N, argc, argv);
-    }
 
     // the input file is a required argument; if not found, we will exit
@@ -125 +118 @@
         psError(PSPHOT_ERR_ARGUMENTS, false, "pmConfigFileSetsMD failed to parse arguments");
         return NULL;
+    }
+
+    // chip selection is used to limit chips to be processed
+    if ((N = psArgumentGet (*argc, argv, "-chip"))) {
+        psArgumentRemove (N, argc, argv);
+        psMetadataAddStr (config->arguments, PS_LIST_TAIL, "CHIP_SELECTIONS", PS_DATA_STRING, "", psStringCopy(argv[N]));
+        psArgumentRemove (N, argc, argv);
     }