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

Timestamp:

Oct 28, 2009, 5:35:05 PM (17 years ago)

Author:

Paul Price

Message:

Reworking stack combination because there are *three* modes for pixels going into the final stack (after rejection), not just two: tested and good, tested and rejected, and not tested. The code did not recognise the third, which is a distinct state because we don't want these pixels grown, as we do for rejected pixels. This cannot be fixed merely by using the 'safe' combination because that would discard the 'tested and good' pixels that have only a single unrejected input but are good because they have survived the testing process. Needed to add a new state into the combination process. Now I add these pixels straight into the 'reject' list. This requires a little bit more fiddling around in ppStack. Not sure it's working yet.

File:

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

branches/pap/ppStack/src/ppStackLoop.c

@@ -97 +97 @@
     // Final combination
     psTrace("ppStack", 2, "Final stack of convolved images....\n");
-    if (!ppStackCombineFinal(options->outRO, stack, options->convCovars, options, config,
-                             true, false, false)) {
+    if (!ppStackCombineFinal(options->outRO, stack, options->convCovars, options, config, false, false)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to perform final combination.");
         psFree(stack);
@@ -106 +105 @@
     psLogMsg("ppStack", PS_LOG_INFO, "Stage 5: Final Stack: %f sec", psTimerClear("PPSTACK_STEPS"));
     ppStackMemDump("final");
-
 
     // Clean up
@@ -121 +119 @@
     psFree(stack);
 
-
 #if 1
     // Unconvolved stack --- it's cheap to calculate, compared to everything else!
@@ -133 +130 @@
         }
         psTrace("ppStack", 2, "Stack of unconvolved images....\n");
-        if (!ppStackCombineFinal(options->unconvRO, stack, options->origCovars, options, config,
-                                 true, true, true)) {
+        if (!ppStackCombineFinal(options->unconvRO, stack, options->origCovars, options, config, true, true)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to perform unconvolved combination.");
             psFree(stack);
@@ -158 +154 @@
     ppStackMemDump("photometry");
 
-
     // Finish up
     psTrace("ppStack", 1, "Finishing up....\n");
@@ -170 +165 @@
 
     psFree(options);
+
     return true;
 }