Changeset 20777

Timestamp:

Nov 17, 2008, 2:39:58 PM (17 years ago)

Author:

Paul Price

Message:

Need to explicitly drop psphot internal files following changes to psphotReadoutCleanup.

Location:

trunk

Files:

• ppStack/src/ppStackPhotometry.c (modified) (1 diff)
• ppSub/src/ppSubReadout.c (modified) (2 diffs)

trunk/ppStack/src/ppStackPhotometry.c

@@ -145 +145 @@
     }
 
+    if (!pmFPAfileDropInternal(config->files, "PSPHOT.BACKMDL") ||
+        !pmFPAfileDropInternal (config->files, "PSPHOT.BACKMDL.STDEV") ||
+        !pmFPAfileDropInternal (config->files, "PSPHOT.BACKGND")) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to drop PSPHOT internal files.");
+        return false;
+    }
+
     pmFPAfileActivate(config->files, false, "PSPHOT.INPUT");
 

trunk/ppSub/src/ppSubReadout.c

@@ -411 +411 @@
         }
 
+        if (!pmFPAfileDropInternal(config->files, "PSPHOT.BACKMDL") ||
+            !pmFPAfileDropInternal (config->files, "PSPHOT.BACKMDL.STDEV") ||
+            !pmFPAfileDropInternal (config->files, "PSPHOT.BACKGND")) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to drop PSPHOT internal files.");
+            return false;
+        }
+
         if (breakpoint) {
             psMetadataAddStr(psphotRecipe, PS_LIST_TAIL, "BREAK_POINT", PS_META_REPLACE,
@@ -564 +571 @@
         }
 
+        if (!pmFPAfileDropInternal(config->files, "PSPHOT.BACKMDL") ||
+            !pmFPAfileDropInternal (config->files, "PSPHOT.BACKMDL.STDEV") ||
+            !pmFPAfileDropInternal (config->files, "PSPHOT.BACKGND")) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to drop PSPHOT internal files.");
+            return false;
+        }
+
         pmFPAfileActivate(config->files, false, "PSPHOT.INPUT");
         pmFPAfileActivate(config->files, false, "PSPHOT.LOAD.PSF");