Changeset 25911 for branches/pap/ppStack/src/ppStackCombineFinal.c

Timestamp:

Oct 21, 2009, 1:03:45 PM (17 years ago)

Author:

Paul Price

Message:

Adding unconvolved mask and variance as outputs in addition to the unconvolved image.

File:

• branches/pap/ppStack/src/ppStackCombineFinal.c (modified) (3 diffs)

branches/pap/ppStack/src/ppStackCombineFinal.c

@@ -10 +10 @@
 #include "ppStackLoop.h"
 
-bool ppStackCombineFinal(pmReadout *target, ppStackThreadData *stack,
+bool ppStackCombineFinal(pmReadout *target, ppStackThreadData *stack, psArray *covariances,
                          ppStackOptions *options, pmConfig *config, bool full, bool normalise)
 {
@@ -56 +56 @@
 
     // Sum covariance matrices
-    if (options->covariances) {
+    if (covariances) {
         double sumWeights = 0.0;            // Sum of weights
         for (int i = 0; i < options->num; i++) {
             if (options->inputMask->data.U8[i]) {
-                psFree(options->covariances->data[i]);
-                options->covariances->data[i] = NULL;
+                psFree(covariances->data[i]);
+                covariances->data[i] = NULL;
                 continue;
             }
-            psKernel *covar = options->covariances->data[i]; // Covariance matrix
+            psKernel *covar = covariances->data[i]; // Covariance matrix
             if (!covar) {
                 continue;
@@ -73 +73 @@
         }
         if (sumWeights > 0.0) {
-            target->covariance = psImageCovarianceSum(options->covariances);
+            target->covariance = psImageCovarianceSum(covariances);
             psBinaryOp(target->covariance->image, target->covariance->image, "/",
                        psScalarAlloc(sumWeights, PS_TYPE_F32));
-            psFree(options->covariances); options->covariances = NULL;
             psImageCovarianceTransfer(target->variance, target->covariance);
         }