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

Timestamp:

Mar 23, 2010, 9:02:41 PM (16 years ago)

Author:

Paul Price

Message:

Something was missing from the merge (probably because I tool r27400 out), so had to get it back.

File:

• trunk/ppStack/src/ppStackLoop.c (modified) (5 diffs)

trunk/ppStack/src/ppStackLoop.c

@@ -111 +111 @@
 
     // Prepare for combination
-    if (!ppStackCombinePrepare(&options->outRO, "PPSTACK.OUTPUT", PPSTACK_FILES_STACK,
+    if (!ppStackCombinePrepare("PPSTACK.OUTPUT", "PPSTACK.OUTPUT.EXP", PPSTACK_FILES_STACK,
                                stack, options, config)) {
         psError(psErrorCodeLast(), false, "Unable to prepare for combination.");
@@ -160 +160 @@
     // Final combination
     psTrace("ppStack", 2, "Final stack of convolved images....\n");
-    if (!ppStackCombineFinal(options->outRO, stack, options->convCovars, options, config,
-                             false, false, true)) {
+    if (!ppStackCombineFinal(stack, options->convCovars, options, config, false, false, true)) {
         psError(psErrorCodeLast(), false, "Unable to perform final combination.");
         psFree(stack);
@@ -203 +202 @@
 
         // Prepare for combination
-        if (!ppStackCombinePrepare(&options->unconvRO, "PPSTACK.UNCONV", PPSTACK_FILES_UNCONV,
+        if (!ppStackCombinePrepare("PPSTACK.UNCONV", "PPSTACK.UNCONV.EXP", PPSTACK_FILES_UNCONV,
                                    stack, options, config)) {
             psError(psErrorCodeLast(), false, "Unable to prepare for combination.");
@@ -211 +210 @@
 
         psTrace("ppStack", 2, "Stack of unconvolved images....\n");
-        if (!ppStackCombineFinal(options->unconvRO, stack, options->origCovars, options, config,
+        if (!ppStackCombineFinal(stack, options->origCovars, options, config,
                                  false, true, false)) {
             psError(psErrorCodeLast(), false, "Unable to perform unconvolved combination.");
@@ -226 +225 @@
         }
         ppStackFileActivation(config, PPSTACK_FILES_UNCONV, false);
-        options->unconvRO->data_exists = false;
-        options->unconvRO->parent->data_exists = false;
-        options->unconvRO->parent->parent->data_exists = false;
-        psFree(options->unconvRO);
-        options->unconvRO = NULL;
+        options->outRO->data_exists = false;
+        options->outRO->parent->data_exists = false;
+        options->outRO->parent->parent->data_exists = false;
+        psFree(options->outRO);
+        options->outRO = NULL;
+        options->expRO->data_exists = false;
+        options->expRO->parent->data_exists = false;
+        options->expRO->parent->parent->data_exists = false;
+        psFree(options->expRO);
+        options->expRO = NULL;
 
         for (int i = 0; i < options->num; i++) {