Changeset 17016

Timestamp:

Mar 17, 2008, 12:26:43 PM (18 years ago)

Author:

Paul Price

Message:

Fix problem where doing the photometry was removing sources from the output image.

Location:

trunk/ppStack/src

Files:

• ppStackCamera.c (modified) (1 diff)
• ppStackLoop.c (modified) (2 diffs)

trunk/ppStack/src/ppStackCamera.c

@@ -292 +292 @@
         // This file, PSPHOT.INPUT, is just used as a carrier; output files (eg, PSPHOT.RESID) are defined by
         // psphotDefineFiles
-        pmFPAfile *psphotInput = pmFPAfileDefineOutputFromFile(config, output, "PSPHOT.INPUT");
+        pmFPAfile *psphotInput = pmFPAfileDefineFromFPA(config, output->fpa, 1, 1, "PSPHOT.INPUT");
         if (!psphotInput) {
             psError(PS_ERR_IO, false, _("Unable to generate output file from PSPHOT.INPUT"));

trunk/ppStack/src/ppStackLoop.c

@@ -26 +26 @@
 
 // Files for photometry
-static char *photFiles[] = { "PSPHOT.OUTPUT", "PSPHOT.RESID", "PSPHOT.BACKMDL",
+static char *photFiles[] = { "PSPHOT.INPUT", "PSPHOT.OUTPUT", "PSPHOT.RESID", "PSPHOT.BACKMDL",
                              "PSPHOT.BACKMDL.STDEV", "PSPHOT.BACKGND", "PSPHOT.BACKSUB",
                              "SOURCE.PLOT.MOMENTS", "SOURCE.PLOT.PSFMODEL", "SOURCE.PLOT.APRESID",
@@ -609 +609 @@
 
         // Write out the output files
-        fileActivation(config, combineFiles, true);
         filesIterateUp(config);