Changeset 25788 for branches/pap/ppStack/src/ppStackLoop.c

Timestamp:

Oct 6, 2009, 1:19:44 PM (17 years ago)

Author:

Paul Price

Message:

Implemented unconvolved stack using rejections from convolved stack.

File:

• branches/pap/ppStack/src/ppStackLoop.c (modified) (4 diffs)

branches/pap/ppStack/src/ppStackLoop.c

@@ -56 +56 @@
     // Start threading
     ppStackThreadInit();
-    ppStackThreadData *stack = ppStackThreadDataSetup(options, config);
+    ppStackThreadData *stack = ppStackThreadDataSetup(options, config, true);
     if (!stack) {
         psError(PS_ERR_IO, false, "Unable to initialise stack threads.");
@@ -122 +122 @@
 
 
+#if 1
+    // Unconvolved stack --- it's cheap to calculate, compared to everything else!
+    if (options->convolve) {
+        // Start threading
+        ppStackThreadData *stack = ppStackThreadDataSetup(options, config, false);
+        if (!stack) {
+            psError(PS_ERR_IO, false, "Unable to initialise stack threads.");
+            psFree(options);
+            return false;
+        }
+        psFree(options->cells); options->cells = NULL;
+        psTrace("ppStack", 2, "Final stack of convolved images....\n");
+        if (!ppStackCombineFinal(stack, options, config)) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to perform final combination.");
+            psFree(stack);
+            psFree(options);
+            return false;
+        }
+        psLogMsg("ppStack", PS_LOG_INFO, "Stage 7: Unconvolved Stack: %f sec", psTimerClear("PPSTACK_STEPS"));
+        ppStackMemDump("unconv");
+
+        psFree(stack);
+    }
+#endif
+
     // Photometry
     psTrace("ppStack", 1, "Photometering stacked image....\n");
@@ -129 +154 @@
         return false;
     }
-    psLogMsg("ppStack", PS_LOG_INFO, "Stage 7: Photometry Analysis: %f sec", psTimerClear("PPSTACK_STEPS"));
+    psLogMsg("ppStack", PS_LOG_INFO, "Stage 8: Photometry Analysis: %f sec", psTimerClear("PPSTACK_STEPS"));
     ppStackMemDump("photometry");
 
@@ -140 +165 @@
         return false;
     }
-    psLogMsg("ppStack", PS_LOG_INFO, "Stage 8: Final output: %f sec", psTimerClear("PPSTACK_STEPS"));
+    psLogMsg("ppStack", PS_LOG_INFO, "Stage 9: Final output: %f sec", psTimerClear("PPSTACK_STEPS"));
     ppStackMemDump("finish");