Changeset 22730

Timestamp:

Mar 2, 2009, 10:39:25 AM (17 years ago)

Author:

Paul Price

Message:

Attempt to write output files when photometry fails, but still return an error.

Location:

trunk/ppStack/src

Files:

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

trunk/ppStack/src/ppStackLoop.c

@@ -1163 +1163 @@
         fileActivation(config, photFiles, true);
         pmFPAview *photView = filesIterateDown(config);
+        fileActivation(config, combineFiles, true);
+
         if (!ppStackPhotometry(config, outRO, photView)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to perform photometry on output.");
+            filesIterateUp(config);
             psFree(outRO);
             psFree(photView);
@@ -1170 +1173 @@
         }
         psFree(photView);
-
-        fileActivation(config, combineFiles, true);
 
         if (stats) {

trunk/ppStack/src/ppStackPhotometry.c

@@ -149 +149 @@
     if (!psphotReadoutKnownSources(config, view, inSources)) {
         // Clear the error, so that the output files are written.
-        psWarning("Unable to perform photometry on stacked image.");
-        psErrorStackPrint(stderr, "Error stack from photometry:");
-        psErrorClear();
+        psError(PS_ERR_UNKNOWN, false, "Unable to perform photometry on stacked image.");
+        return false;
     }