Changeset 31442 for branches/eam_branches/ipp-20110404/ppStack/src/ppStackLoop.c

Timestamp:

May 5, 2011, 10:09:53 AM (15 years ago)

Author:

eugene

Message:

merging updates from trunk

File:

• branches/eam_branches/ipp-20110404/ppStack/src/ppStackLoop.c (modified) (2 diffs)

branches/eam_branches/ipp-20110404/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.
+      if (!ppStackCombineFinal(stack, options->convCovars, options, config, false, true, true)) {
+        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");
+
+    // Update Header
+    // Do this before performing photometry so that the cmf header gets all of the information.
+    if (!ppStackUpdateHeader(stack, options, config)) {
+        psError(psErrorCodeLast(), false, "Unable to update header.");
+        psFree(stack);
+        return false;
+    }
 
     // Photometry
@@ -132 +151 @@
     ppStackMemDump("photometry");
 
-    // Update Header
-    if (!ppStackUpdateHeader(stack, options, config)) {
-        psError(psErrorCodeLast(), false, "Unable to update header.");
-        psFree(stack);
-        return false;
-    }
     // Create JPEGS
     if (!ppStackJPEGs(stack, options, config)) {