Changeset 30631 for branches/czw_branch/20101203/ppStack/src/ppStackConvolve.c

Timestamp:

Feb 14, 2011, 1:05:28 PM (15 years ago)

Author:

watersc1

Message:

Merge of trunk back into branch.

Location:

branches/czw_branch/20101203

Files:

• . (modified) (1 prop)
• ppStack/src/ppStackConvolve.c (modified) (4 diffs)

branches/czw_branch/20101203/ppStack/src/ppStackConvolve.c

@@ -1 @@
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <pslib.h>
-#include <psmodules.h>
-
 #include "ppStack.h"
-#include "ppStackLoop.h"
 
 //#define TESTING
-
 
 // Update the value of a concept
@@ -20 +10 @@
     item->data.F32 = VALUE; \
 }
-
-
 
 bool ppStackConvolve(ppStackOptions *options, pmConfig *config)
@@ -69 +57 @@
         ppStackFileActivationSingle(config, PPSTACK_FILES_CONVOLVE, true, i);
         if (options->convolve) {
-            // XXX PPSTACK.CONV.KERNEL not defined unless convolve
-            // pmFPAfileActivate(config->files, true, "PPSTACK.CONV.KERNEL");
+            // PPSTACK.CONV.KERNEL not defined unless convolve
             pmFPAfileActivateSingle(config->files, true, "PPSTACK.CONV.KERNEL", i); // Activated file
         }
@@ -191 +178 @@
         }
         psFree(maskHeader);
-        if (!ppStackWriteImage(options->convVariances->data[i], hdu->header, readout->variance, config)) {
+        if (!ppStackWriteVariance(options->convVariances->data[i], hdu->header, readout->variance, readout->covariance->image, config)) {
             psError(PPSTACK_ERR_IO, false, "Unable to write convolved variance %d", i);
             psFree(fpaList);