Changeset 35536 for branches/eam_branches/ipp-20130419/pswarp/src/pswarpCleanup.c

Timestamp:

May 8, 2013, 4:56:44 PM (13 years ago)

Author:

eugene

Message:

cleanup file activation calls

File:

• branches/eam_branches/ipp-20130419/pswarp/src/pswarpCleanup.c (modified) (2 diffs)

branches/eam_branches/ipp-20130419/pswarp/src/pswarpCleanup.c

@@ -11 +11 @@
 
 # include "pswarp.h"
-# include "pswarpFileNames.h"
+
+// Lists of file rules which we may need to save here
+static char *outputFiles[] = {
+  "PSWARP.OUTPUT",
+  "PSWARP.OUTPUT.MASK",
+  "PSWARP.OUTPUT.VARIANCE",
+  "PSWARP.OUTPUT.BKGMODEL",
+  "PSWARP.OUTPUT.SOURCES",
+  "PSPHOT.INPUT",
+  "PSPHOT.OUTPUT",
+  "PSPHOT.RESID",
+  "PSPHOT.BACKMDL",
+  "PSPHOT.BACKMDL.STDEV",
+  "PSPHOT.BACKGND",
+  "PSPHOT.BACKSUB",
+  "PSPHOT.PSF.SAVE",
+  "SOURCE.PLOT.MOMENTS",
+  "SOURCE.PLOT.PSFMODEL",
+  "SOURCE.PLOT.APRESID",
+  NULL
+};
 
 void pswarpCleanup (pmConfig *config, pswarpStatsFile *statsFile)
@@ -17 +37 @@
     psExit exitValue = pswarpExitCode(PS_EXIT_SUCCESS); // Exit code
 
-    // Ensure everything is written out, at every level
-    pswarpFileActivation(config, detectorFiles, false);
-    pswarpFileActivation(config, independentFiles, false);
-
-    pswarpFileActivation(config, photFiles, true);
-    pswarpFileActivation(config, skycellFiles, true);
-    pmFPAfileActivate(config->files, true, "PSWARP.OUTPUT.SOURCES");
+    // activate all of the relevant output files
+    pmFPAfileActivate(config->files, false, NULL);
+    for (int i = 0; outputFiles[i] != NULL; i++) {
+        pmFPAfileActivate(config->files, true, outputFiles[i]);
+    }
 
     pmFPAfile *output = psMetadataLookupPtr(NULL, config->files, "PSWARP.OUTPUT");