Changeset 34678

Timestamp:

Nov 19, 2012, 5:45:03 PM (14 years ago)

Author:

watersc1

Message:

finally tracked down the source of that bug. I need to check that I have all my debugging code out, but this at least works.

Location:

branches/czw_branch/20120906/ppStack/src

Files:

• ppStack.h (modified) (1 diff)
• ppStackCleanup.c (modified) (2 diffs)
• ppStackCombinePrepare.c (modified) (1 diff)
• ppStackFiles.c (modified) (2 diffs)

branches/czw_branch/20120906/ppStack/src/ppStack.h

@@ -40 +40 @@
     PPSTACK_FILES_PHOT,                 // Files for photometry
     PPSTACK_FILES_BKG,                  // Files for bkg
-    PPSTACK_FILES_MEDIAN,                // Files for median only stacks.
-    PPSTACK_FILES_MINIMAL                // Files for median only stacks.
+    PPSTACK_FILES_MEDIAN_IN,                // Files for median only stacks.
+    PPSTACK_FILES_MEDIAN_OUT                // Files for median only stacks.
 } ppStackFileList;
 

branches/czw_branch/20120906/ppStack/src/ppStackCleanup.c

@@ -76 +76 @@
 
 bool ppStackCleanup (pmConfig *config, ppStackOptions *options) {
-
     psExit exitValue = ppStackExitCode(PS_EXIT_SUCCESS); // Exit code
-
+    
     // Ensure everything closes
     if (config) {
@@ -86 +85 @@
         ppStackFileActivation(config, PPSTACK_FILES_UNCONV, true);
         ppStackFileActivation(config, PPSTACK_FILES_PHOT, true);
+        ppStackFileActivation(config, PPSTACK_FILES_MEDIAN_IN, true);
+        ppStackFileActivation(config, PPSTACK_FILES_MEDIAN_OUT, true);
         if (!ppStackFilesIterateUp(config)) {
             psError(psErrorCodeLast(), false, "Unable to close files.");

branches/czw_branch/20120906/ppStack/src/ppStackCombinePrepare.c

@@ -29 +29 @@
     if (expName) {
       pmCell *expCell = pmFPAfileThisCell(config->files, view, expName); // Exposure cell
-      options->expRO = pmReadoutAlloc(expCell); // Output readout
+      options->expRO = pmReadoutAlloc(expCell); //Output readout
     }
-    else {
-      options->expRO = NULL;
-    }
+/*     else { */
+/*       options->expRO = NULL; */
+/*     } */
     pmCell *bkgCell;
     int bkg_r0,bkg_c0;

branches/czw_branch/20120906/ppStack/src/ppStackFiles.c

@@ -19 +19 @@
 
 /// Files required for median only stacking
-static char *filesMedian[] =  { "PPSTACK.INPUT",                                                     
+static char *filesMedianIn[] =  { "PPSTACK.INPUT",                                                           
                               NULL };
 /// Files required for median only stacking
-static char *filesMinimal[] =  { "PPSTACK.OUTPUT",                                                           
+static char *filesMedianOut[] =  { "PPSTACK.OUTPUT",                                                         
                               NULL };
 
@@ -53 +53 @@
       case PPSTACK_FILES_PHOT:     return filesPhot;
     case PPSTACK_FILES_BKG:        return filesBkg;
-    case PPSTACK_FILES_MEDIAN:        return filesMedian;
-    case PPSTACK_FILES_MINIMAL:        return filesMinimal;
+    case PPSTACK_FILES_MEDIAN_IN:        return filesMedianIn;
+    case PPSTACK_FILES_MEDIAN_OUT:        return filesMedianOut;
       default:
         psAbort("Unrecognised file list: %x", list);