Changeset 20769

Timestamp:

Nov 16, 2008, 4:40:07 PM (17 years ago)

Author:

eugene

Message:

defer drop internal to outside of psphotReadout (these may be used by other programs)

Location:

trunk/psphot/src

Files:

• psphotImageLoop.c (modified) (1 diff)
• psphotReadoutCleanup.c (modified) (1 diff)

trunk/psphot/src/psphotImageLoop.c

@@ -72 +72 @@
                 }
             }
+
+            status = true;
+            status &= pmFPAfileDropInternal (config->files, "PSPHOT.BACKMDL");
+            status &= pmFPAfileDropInternal (config->files, "PSPHOT.BACKMDL.STDEV");
+            status &= pmFPAfileDropInternal (config->files, "PSPHOT.BACKGND");
+            if (!status) {
+                psError(PSPHOT_ERR_PROG, false, "trouble dropping internal files");
+                psFree (view);
+                return false;
+            }
         }
 

trunk/psphot/src/psphotReadoutCleanup.c

@@ -7 +7 @@
 
     // remove internal pmFPAfiles, if created
-    bool status = true;
-    status &= pmFPAfileDropInternal (config->files, "PSPHOT.BACKMDL");
-    status &= pmFPAfileDropInternal (config->files, "PSPHOT.BACKMDL.STDEV");
-    status &= pmFPAfileDropInternal (config->files, "PSPHOT.BACKGND");
-    if (!status) {
-        psError(PSPHOT_ERR_PROG, false, "trouble dropping internal files");
-        psFree (psf);
-        psFree (sources);
-        psFree (detections);
-        return false;
-    }
-
     if (psErrorCodeLast() == PSPHOT_ERR_DATA) {
         psErrorStackPrint(stderr, "Error in the psphot readout analysis");