Changeset 31203 for trunk/ppStack

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

Location:

trunk/ppStack/src

Files:

• ppStackCombineInitial.c (modified) (1 diff)
• ppStackLoop.c (modified) (1 diff)
• ppStackReject.c (modified) (1 diff)

trunk/ppStack/src/ppStackCombineInitial.c

@@ -9 +9 @@
     psAssert(config, "Require configuration");
 
-    if (!options->convolve) {
-        // No need to do initial combination when we haven't convolved
-        // XXX either allocate inspect and rejected here, or do not require them downstream
-        return true;
-    }
+/*     if (!options->convolve) { */
+/*         // No need to do initial combination when we haven't convolved */
+/*         // XXX either allocate inspect and rejected here, or do not require them downstream */
+/*         return true; */
+/*     } */
 
     psTimerStart("PPSTACK_INITIAL");

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");

trunk/ppStack/src/ppStackReject.c

@@ -8 +8 @@
     psAssert(config, "Require configuration");
 
-    if (!options->convolve) {
-        // No need to do complicated rejection when we haven't convolved
-        return true;
-    }
+/*     if (!options->convolve) { */
+/*         // No need to do complicated rejection when we haven't convolved */
+/*         return true; */
+/*     } */
 
     int num = options->num;             // Number of inputs