Changeset 23315

Timestamp:

Mar 12, 2009, 7:22:47 PM (17 years ago)

Author:

Paul Price

Message:

Dump configuration on completion of processing, not before.

Location:

trunk/ppSub/src

Files:

• ppSubArguments.c (modified) (1 diff)
• ppSubLoop.c (modified) (2 diffs)

trunk/ppSub/src/ppSubArguments.c

@@ -397 +397 @@
     psTrace("ppSub", 1, "Done reading command-line arguments\n");
 
-    // Dump configuration, now that's it's settled
-    psBool status;
-    psString dump_file =  psMetadataLookupStr(&status, config->arguments, "-dumpconfig");
-    if (dump_file) {
-        pmConfigCamerasCull(config, NULL);
-        pmConfigRecipesCull(config, "PPSUB,PPSTATS,PSPHOT,MASKS,JPEG");
-
-        pmFPAfile *input = psMetadataLookupPtr(NULL, config->files, "PPSUB.INPUT"); // Input file
-        pmConfigDump(config, input->fpa, dump_file);
-    }
-
     // XXX move this to ppSubArguments
     int threads = psMetadataLookupS32(NULL, config->arguments, "-threads"); // Number of threads

trunk/ppSub/src/ppSubLoop.c

@@ -23 +23 @@
 bool ppSubLoop(pmConfig *config)
 {
+    psAssert(config, "Require configuration.");
+
+    pmConfigCamerasCull(config, NULL);
+    pmConfigRecipesCull(config, "PPSUB,PPSTATS,PSPHOT,MASKS,JPEG");
+
     bool mdok;                          // Status of MD lookup
     const char *statsName = psMetadataLookupStr(&mdok, config->arguments, "STATS"); // Filename for statistics
@@ -172 +177 @@
     }
 
+    psString dump_file = psMetadataLookupStr(&mdok, config->arguments, "-dumpconfig");
+    if (dump_file) {
+
+        pmFPAfile *input = psMetadataLookupPtr(NULL, config->files, "PPSUB.INPUT"); // Input file
+        pmConfigDump(config, input->fpa, dump_file);
+    }
+
     return true;
 }