Changeset 23573 for trunk/ppStack/src/ppStackCombineInitial.c

Timestamp:

Mar 27, 2009, 11:49:17 AM (17 years ago)

Author:

Paul Price

Message:

Allow convolution of images to be optional when stacking.

File:

• trunk/ppStack/src/ppStackCombineInitial.c (modified) (3 diffs)

trunk/ppStack/src/ppStackCombineInitial.c

@@ -16 +16 @@
     psAssert(config, "Require configuration");
 
-    psTimerStart("PPSTACK_FINAL");
+    if (!options->convolve) {
+        // No need to do initial combination when we haven't convolved
+        return true;
+    }
+
+    psTimerStart("PPSTACK_INITIAL");
 
     psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PPSTACK_RECIPE); // ppStack recipe
@@ -69 +74 @@
         }
 
-        // call: ppStackReadoutInitial(config, outRO, readouts, subRegions, subKernels)
         psThreadJob *job = psThreadJobAlloc("PPSTACK_INITIAL_COMBINE"); // Job to start
         psArrayAdd(job->args, 1, thread);
@@ -128 +132 @@
 
     if (options->stats) {
-        psMetadataAddF32(options->stats, PS_LIST_TAIL, "TIME_FINAL", 0,
-                         "Time to make final stack", psTimerMark("PPSTACK_FINAL"));
+        psMetadataAddF32(options->stats, PS_LIST_TAIL, "TIME_INITIAL", 0,
+                         "Time to make final stack", psTimerMark("PPSTACK_INITIAL"));
     }