Changeset 31204

Timestamp:

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

Author:

watersc1

Message:

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

Location:

tags/ipp-20110406

Files:

• ppStack/src/ppStackCombineInitial.c (modified) (1 diff)
• ppStack/src/ppStackLoop.c (modified) (1 diff)
• ppStack/src/ppStackReject.c (modified) (1 diff)
• psModules/src/imcombine/pmStack.c (modified) (1 diff)
• psModules/src/imcombine/pmStackReject.c (modified) (1 diff)

tags/ipp-20110406/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");

tags/ipp-20110406/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");

tags/ipp-20110406/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

tags/ipp-20110406/psModules/src/imcombine/pmStack.c

@@ -37 +37 @@
 # if (0)
 #define TESTING                         // Enable test output
-#define TEST_X 340                       // x coordinate to examine
-#define TEST_Y 938                       // y coordinate to examine
+#define TEST_X 3145                       // x coordinate to examine
+#define TEST_Y 2334                       // y coordinate to examine
 #define TEST_RADIUS 0.5                 // Radius to examine
 # endif

tags/ipp-20110406/psModules/src/imcombine/pmStackReject.c

@@ -125 +125 @@
     PS_ASSERT_FLOAT_LARGER_THAN_OR_EQUAL(threshold, 0.0, NULL);
     PS_ASSERT_FLOAT_LESS_THAN_OR_EQUAL(threshold, 1.0, NULL);
+
+    if (!subRegions || !subKernels) {
+      psPixels *out = psPixelsCopy(NULL,in);
+      return out;
+    }
+    
     PS_ASSERT_ARRAY_NON_NULL(subRegions, NULL);
     PS_ASSERT_ARRAY_NON_NULL(subKernels, NULL);