Changeset 27517 for branches/eam_branches/20100225/ppStack/src/ppStackLoop.c

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

• . (modified) (1 prop)
• ppStack/src/ppStackLoop.c (modified) (14 diffs)

branches/eam_branches/20100225/ppStack/src/ppStackLoop.c

@@ -18 +18 @@
     psString summary = NULL;        // Summary of images
     for (int i = 0; i < options->num; i++) {
-        char *reason;               // Reason for rejecting
-        switch (options->inputMask->data.PS_TYPE_VECTOR_MASK_DATA[i]) {
-          case PPSTACK_MASK_NONE:
-            reason = "Good";
+        psString reason = NULL;         // Reason for rejecting
+        if (options->inputMask->data.PS_TYPE_VECTOR_MASK_DATA[i] == 0) {
+            psStringAppend(&reason, " Good.");
             numGood++;
-            break;
-          case PPSTACK_MASK_CAL:
-            reason = "Calibration failed";
-            break;
-          case PPSTACK_MASK_PSF:
-            reason = "PSF measurement failed";
-            break;
-          case PPSTACK_MASK_MATCH:
-            reason = "PSF matching failed";
-            break;
-          case PPSTACK_MASK_CHI2:
-            reason = "PSF matching chi^2 deviant";
-            break;
-          case PPSTACK_MASK_REJECT:
-            reason = "Rejection exceeded threshold";
-            break;
-          default:
-            psAbort("Unrecognised mask value: %x", options->inputMask->data.PS_TYPE_VECTOR_MASK_DATA[i]);
+        } else {
+            if (options->inputMask->data.PS_TYPE_VECTOR_MASK_DATA[i] & PPSTACK_MASK_CAL) {
+                psStringAppend(&reason, " Calibration failed.");
+            }
+            if (options->inputMask->data.PS_TYPE_VECTOR_MASK_DATA[i] & PPSTACK_MASK_PSF) {
+                psStringAppend(&reason, " PSF measurement failed.");
+            }
+            if (options->inputMask->data.PS_TYPE_VECTOR_MASK_DATA[i] & PPSTACK_MASK_MATCH) {
+                psStringAppend(&reason, " PSF matching failed.");
+            }
+            if (options->inputMask->data.PS_TYPE_VECTOR_MASK_DATA[i] & PPSTACK_MASK_CHI2) {
+                psStringAppend(&reason, " PSF matching chi^2 deviant.");
+            }
+            if (options->inputMask->data.PS_TYPE_VECTOR_MASK_DATA[i] & PPSTACK_MASK_REJECT) {
+                psStringAppend(&reason, " Rejection exceeded threshold.");
+            }
         }
         psStringAppend(&summary, "Image %d: %s\n", i, reason);
+        psFree(reason);
     }
     psLogMsg("ppStack", PS_LOG_INFO, "Summary of images for %s:\n%s", place, summary);
@@ -52 +50 @@
 
 
-bool ppStackLoop(pmConfig *config)
+bool ppStackLoop(pmConfig *config, ppStackOptions *options)
 {
     assert(config);
@@ -58 +56 @@
     psTimerStart("PPSTACK_TOTAL");
     psTimerStart("PPSTACK_STEPS");
-
-    ppStackOptions *options = ppStackOptionsAlloc(); // Options for stacking
 
     // Setup
@@ -65 +61 @@
     if (!ppStackSetup(options, config)) {
         psError(psErrorCodeLast(), false, "Unable to setup.");
-        psFree(options);
         return false;
     }
@@ -76 +71 @@
     if (!ppStackPrepare(options, config)) {
         psError(psErrorCodeLast(), false, "Unable to prepare for stacking.");
-        psFree(options);
         return false;
     }
@@ -82 +76 @@
              psTimerClear("PPSTACK_STEPS"));
     ppStackMemDump("prepare");
-
+    if (options->quality) {
+        // Can't do anything else
+        return true;
+    }
 
     // Convolve inputs
@@ -88 +85 @@
     if (!ppStackConvolve(options, config)) {
         psError(psErrorCodeLast(), false, "Unable to convolve images.");
-        psFree(options);
         return false;
     }
@@ -111 +107 @@
     if (!stack) {
         psError(psErrorCodeLast(), false, "Unable to initialise stack threads.");
-        psFree(options);
         return false;
     }
 
     // Prepare for combination
-    if (!ppStackCombinePrepare(stack, options, config)) {
+    if (!ppStackCombinePrepare("PPSTACK.OUTPUT", "PPSTACK.OUTPUT.EXP", PPSTACK_FILES_STACK,
+                               stack, options, config)) {
         psError(psErrorCodeLast(), false, "Unable to prepare for combination.");
         psFree(stack);
-        psFree(options);
         return false;
     }
@@ -128 +123 @@
         psError(psErrorCodeLast(), false, "Unable to perform initial combination.");
         psFree(stack);
-        psFree(options);
-        return false;
-    }
-    ppStackMemDump("convolve");
+        return false;
+    }
+    ppStackMemDump("initial");
     psLogMsg("ppStack", PS_LOG_INFO, "Stage 3: Make Initial Stack: %f sec", psTimerClear("PPSTACK_STEPS"));
 
+    // Done with stack inputs for now
+    for (int i = 0; i < options->num; i++) {
+        pmCellFreeData(options->cells->data[i]);
+    }
+    psFree(stack);
 
     // Pixel rejection
@@ -140 +139 @@
         psError(psErrorCodeLast(), false, "Unable to reject pixels.");
         psFree(stack);
-        psFree(options);
         return false;
     }
     psLogMsg("ppStack", PS_LOG_INFO, "Stage 4: Pixel Rejection: %f sec", psTimerClear("PPSTACK_STEPS"));
-    ppStackMemDump("reject");
 
     // Check inputs
@@ -155 +152 @@
     }
 
+    stack = ppStackThreadDataSetup(options, config, true);
+    if (!stack) {
+        psError(psErrorCodeLast(), false, "Unable to initialise stack threads.");
+        return false;
+    }
+
     // Final combination
     psTrace("ppStack", 2, "Final stack of convolved images....\n");
-    if (!ppStackCombineFinal(options->outRO, stack, options->convCovars, options, config, false, false)) {
+    if (!ppStackCombineFinal(stack, options->convCovars, options, config, false, false, true)) {
         psError(psErrorCodeLast(), false, "Unable to perform final combination.");
         psFree(stack);
-        psFree(options);
         return false;
     }
     psLogMsg("ppStack", PS_LOG_INFO, "Stage 5: Final Stack: %f sec", psTimerClear("PPSTACK_STEPS"));
     ppStackMemDump("final");
+
+    // Photometry
+    psTrace("ppStack", 1, "Photometering stacked image....\n");
+    if (!ppStackPhotometry(options, config)) {
+        psError(psErrorCodeLast(), false, "Unable to perform photometry.");
+        return false;
+    }
+    psLogMsg("ppStack", PS_LOG_INFO, "Stage 6: Photometry Analysis: %f sec", psTimerClear("PPSTACK_STEPS"));
+    ppStackMemDump("photometry");
 
     // Clean up
@@ -171 +182 @@
         psError(psErrorCodeLast(), false, "Unable to clean up.");
         psFree(stack);
-        psFree(options);
-        return false;
-    }
-    psLogMsg("ppStack", PS_LOG_INFO, "Stage 6: Cleanup, WCS & JPEGS: %f sec", psTimerClear("PPSTACK_STEPS"));
+        return false;
+    }
+    for (int i = 0; i < options->num; i++) {
+        pmCellFreeData(options->cells->data[i]);
+    }
+    psFree(stack);
+    psLogMsg("ppStack", PS_LOG_INFO, "Stage 7: Cleanup, WCS & JPEGS: %f sec", psTimerClear("PPSTACK_STEPS"));
     ppStackMemDump("cleanup");
-
-    psFree(stack);
 
 #if 1
@@ -186 +198 @@
         if (!stack) {
             psError(psErrorCodeLast(), false, "Unable to initialise stack threads.");
-            psFree(options);
-            return false;
-        }
+            return false;
+        }
+
+        // Prepare for combination
+        if (!ppStackCombinePrepare("PPSTACK.UNCONV", "PPSTACK.UNCONV.EXP", PPSTACK_FILES_UNCONV,
+                                   stack, options, config)) {
+            psError(psErrorCodeLast(), false, "Unable to prepare for combination.");
+            psFree(stack);
+            return false;
+        }
+
         psTrace("ppStack", 2, "Stack of unconvolved images....\n");
-        if (!ppStackCombineFinal(options->unconvRO, stack, options->origCovars, options, config, false, true)) {
+        if (!ppStackCombineFinal(stack, options->origCovars, options, config,
+                                 false, true, false)) {
             psError(psErrorCodeLast(), false, "Unable to perform unconvolved combination.");
             psFree(stack);
-            psFree(options);
-            return false;
-        }
-        psLogMsg("ppStack", PS_LOG_INFO, "Stage 7: Unconvolved Stack: %f sec", psTimerClear("PPSTACK_STEPS"));
+            return false;
+        }
+        psLogMsg("ppStack", PS_LOG_INFO, "Stage 8: Unconvolved Stack: %f sec", psTimerClear("PPSTACK_STEPS"));
         ppStackMemDump("unconv");
 
+        if (!ppStackFilesIterateUp(config)) {
+            psError(psErrorCodeLast(), false, "Unable to close files.");
+            psFree(stack);
+            return false;
+        }
+        ppStackFileActivation(config, PPSTACK_FILES_UNCONV, false);
+        options->outRO->data_exists = false;
+        options->outRO->parent->data_exists = false;
+        options->outRO->parent->parent->data_exists = false;
+        psFree(options->outRO);
+        options->outRO = NULL;
+        options->expRO->data_exists = false;
+        options->expRO->parent->data_exists = false;
+        options->expRO->parent->parent->data_exists = false;
+        psFree(options->expRO);
+        options->expRO = NULL;
+
+        for (int i = 0; i < options->num; i++) {
+            pmCellFreeData(options->cells->data[i]);
+        }
         psFree(stack);
     }
     psFree(options->cells); options->cells = NULL;
 #endif
-
-    // Photometry
-    psTrace("ppStack", 1, "Photometering stacked image....\n");
-    if (!ppStackPhotometry(options, config)) {
-        psError(psErrorCodeLast(), false, "Unable to perform photometry.");
-        psFree(options);
-        return false;
-    }
-    psLogMsg("ppStack", PS_LOG_INFO, "Stage 8: Photometry Analysis: %f sec", psTimerClear("PPSTACK_STEPS"));
-    ppStackMemDump("photometry");
 
     // Finish up
@@ -218 +248 @@
     if (!ppStackFinish(options, config)) {
         psError(psErrorCodeLast(), false, "Unable to finish up.");
-        psFree(options);
-        return false;
-    }
-    psLogMsg("ppStack", PS_LOG_INFO, "Stage 9: Final output: %f sec", psTimerClear("PPSTACK_STEPS"));
+        return false;
+    }
     ppStackMemDump("finish");
-
-    psFree(options);
 
     return true;