Changeset 23314

Timestamp:

Mar 12, 2009, 7:19:10 PM (17 years ago)

Author:

Paul Price

Message:

Dump configuration on completion of processing, not before.

Location:

trunk/pswarp/src

Files:

• pswarpArguments.c (modified) (1 diff)
• pswarpLoop.c (modified) (2 diffs)

trunk/pswarp/src/pswarpArguments.c

@@ -199 +199 @@
     psTrace("pswarp", 1, "Done with pswarpArguments...\n");
 
-    // Dump configuration, now that's it's settled
-    psString dump_file =  psMetadataLookupStr(&status, config->arguments, "DUMP_CONFIG");
-    if (dump_file) {
-        const char *skyCamera = psMetadataLookupStr(NULL, config->arguments,
-                                                    "SKYCELL.CAMERA");  ///< Name of camera for skycell
-        pmConfigCamerasCull(config, skyCamera);
-        pmConfigRecipesCull(config, "PSWARP,PPSTATS,PSPHOT,MASKS,JPEG");
-
-        pmFPAfile *input = psMetadataLookupPtr(NULL, config->files, "PSWARP.INPUT"); // Input file
-        pmConfigDump(config, input->fpa, dump_file);
-    }
-
     return (config);
 }

trunk/pswarp/src/pswarpLoop.c

@@ -76 +76 @@
     bool status;
 
+    const char *skyCamera = psMetadataLookupStr(NULL, config->arguments,
+                                                "SKYCELL.CAMERA");  ///< Name of camera for skycell
+    pmConfigCamerasCull(config, skyCamera);
+    pmConfigRecipesCull(config, "PSWARP,PPSTATS,PSPHOT,MASKS,JPEG");
+
+
     // load the recipe
     psMetadata *recipe = psMetadataLookupPtr (&status, config->recipes, PSWARP_RECIPE);
@@ -462 +468 @@
     }
 
+    // Dump configuration
+    psString dump_file = psMetadataLookupStr(&status, config->arguments, "DUMP_CONFIG");
+    if (dump_file) {
+        pmFPAfile *input = psMetadataLookupPtr(NULL, config->files, "PSWARP.INPUT"); // Input file
+        pmConfigDump(config, input->fpa, dump_file);
+    }
+
     return true;
 }