Changeset 16863

Timestamp:

Mar 6, 2008, 4:15:36 PM (18 years ago)

Author:

Paul Price

Message:

Do photometry and combination files separately.

File:

• trunk/ppStack/src/ppStackLoop.c (modified) (5 diffs)

trunk/ppStack/src/ppStackLoop.c

@@ -16 +16 @@
 // Here follows lists of files for activation/deactivation at various stages.  Each must be NULL-terminated.
 
-#if 0
-// All files in the system
-static char *allFiles[] = { "PPSTACK.INPUT", "PPSTACK.INPUT.MASK", "PPSTACK.INPUT.WEIGHT",
-                            "PPSTACK.OUTPUT", "PPSTACK.OUTPUT.MASK", "PPSTACK.OUTPUT.WEIGHT",
-                            "PSPHOT.PSF.SAVE", "PSPHOT.PSF.LOAD", "PPSTACK.SOURCES",
-                            "PSPHOT.OUTPUT", "PSPHOT.RESID", "PSPHOT.BACKMDL", "PSPHOT.BACKMDL.STDEV",
-                            "PSPHOT.BACKGND", "PSPHOT.BACKSUB", "SOURCE.PLOT.MOMENTS",
-                            "SOURCE.PLOT.PSFMODEL", "SOURCE.PLOT.APRESID", "PSPHOT.INPUT.CMF",
-                            0 };
-#endif
-
 // Files required in preparation for convolution
-static char *prepareFiles[] = { "PSPHOT.PSF.LOAD", "PPSTACK.SOURCES", 0 };
+static char *prepareFiles[] = { "PPSTACK.INPUT.PSF", "PPSTACK.SOURCES", NULL };
 
 // Files required for the convolution
-static char *convolveFiles[] = { "PPSTACK.INPUT", "PPSTACK.INPUT.MASK", "PPSTACK.INPUT.WEIGHT", 0 };
+static char *convolveFiles[] = { "PPSTACK.INPUT", "PPSTACK.INPUT.MASK", "PPSTACK.INPUT.WEIGHT", NULL };
 
 // Output files for the combination
-static char *combineFiles[] = { "PPSTACK.OUTPUT", "PPSTACK.OUTPUT.MASK", "PPSTACK.OUTPUT.WEIGHT", 0 };
+static char *combineFiles[] = { "PPSTACK.OUTPUT", "PPSTACK.OUTPUT.MASK", "PPSTACK.OUTPUT.WEIGHT", NULL };
 
 // Files for photometry
@@ -40 +29 @@
                              "PSPHOT.BACKMDL.STDEV", "PSPHOT.BACKGND", "PSPHOT.BACKSUB",
                              "SOURCE.PLOT.MOMENTS", "SOURCE.PLOT.PSFMODEL", "SOURCE.PLOT.APRESID",
-                             "PSPHOT.INPUT.CMF", 0 };
+                             "PSPHOT.INPUT.CMF", NULL };
 
 
@@ -369 +358 @@
         pmFPAfileActivate(config->files, false, NULL);
         fileActivation(config, combineFiles, true);
-        if (psMetadataLookupBool(&mdok, config->arguments, "PHOTOMETRY")) {
-            fileActivation(config, photFiles, true);
-        }
         pmFPAview *view = filesIterateDown(config);
         if (!view) {
@@ -557 +543 @@
 
         if (psMetadataLookupBool(&mdok, config->arguments, "PHOTOMETRY")) {
+
+            fileActivation(config, combineFiles, false);
+            fileActivation(config, photFiles, true);
+            filesIterateDown(config);
+
             psTrace("ppStack", 1, "Photometering stacked image....\n");
             if (!ppStackPhotometry(config, outRO, view)) {
@@ -564 +555 @@
                 return false;
             }
+
+            fileActivation(config, combineFiles, true);
         }