Changeset 31203 for trunk/ppStack/src/ppStackLoop.c

Timestamp:

Apr 6, 2011, 1:15:47 PM (15 years ago)

Author:

watersc1

Message:

Updates to ppStack to allow CONVOLVE=FALSE stacks to be generated

File:

• trunk/ppStack/src/ppStackLoop.c (modified) (1 diff)

trunk/ppStack/src/ppStackLoop.c

@@ -115 +115 @@
     // Final combination.  This one does NOT need to be normalized since the convolution takes care of that
     psTrace("ppStack", 2, "Final stack of convolved images....\n");
-    if (!ppStackCombineFinal(stack, options->convCovars, options, config, false, false, true)) {
+    if (options->convolve) {
+      if (!ppStackCombineFinal(stack, options->convCovars, options, config, false, false, true)) {
         psError(psErrorCodeLast(), false, "Unable to perform final combination.");
         psFree(stack);
         return false;
-    }
+      }
+    }
+    else {
+      // Since we haven't convolved, I believe we do need to normalize here. We also cannot grow.
+      if (!ppStackCombineFinal(stack, options->convCovars, options, config, false, true, false)) {
+        psError(psErrorCodeLast(), false, "Unable to perform final combination.");
+        psFree(stack);
+        return false;
+      }
+    }
+      
     psLogMsg("ppStack", PS_LOG_INFO, "Stage 5: Final Stack: %f sec", psTimerClear("PPSTACK_STEPS"));
     ppStackMemDump("final");