Changeset 25806

Timestamp:

Oct 7, 2009, 5:39:41 PM (17 years ago)

Author:

Paul Price

Message:

Only combine covariances if they're there to combine.

File:

• branches/pap/ppStack/src/ppStackCombineFinal.c (modified) (1 diff)

branches/pap/ppStack/src/ppStackCombineFinal.c

@@ -48 +48 @@
 
     // Sum covariance matrices
-    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;
-            continue;
+    if (options->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;
+                continue;
+            }
+            psKernel *covar = options->covariances->data[i]; // Covariance matrix
+            if (!covar) {
+                continue;
+            }
+            float weight = options->weightings->data.F32[i]; // Weight to apply
+            psBinaryOp(covar->image, covar->image, "*", psScalarAlloc(weight, PS_TYPE_F32));
+            sumWeights += weight;
         }
-        psKernel *covar = options->covariances->data[i]; // Covariance matrix
-        if (!covar) {
-            continue;
+        if (sumWeights > 0.0) {
+            pmReadout *outRO = options->outRO;  // Output readout
+            outRO->covariance = psImageCovarianceSum(options->covariances);
+            psBinaryOp(outRO->covariance->image, outRO->covariance->image, "/",
+                       psScalarAlloc(sumWeights, PS_TYPE_F32));
+            psFree(options->covariances); options->covariances = NULL;
+            psImageCovarianceTransfer(outRO->variance, outRO->covariance);
         }
-        float weight = options->weightings->data.F32[i]; // Weight to apply
-        psBinaryOp(covar->image, covar->image, "*", psScalarAlloc(weight, PS_TYPE_F32));
-        sumWeights += weight;
-    }
-    if (sumWeights > 0.0) {
-        pmReadout *outRO = options->outRO;  // Output readout
-        outRO->covariance = psImageCovarianceSum(options->covariances);
-        psBinaryOp(outRO->covariance->image, outRO->covariance->image, "/",
-                   psScalarAlloc(sumWeights, PS_TYPE_F32));
-        psFree(options->covariances); options->covariances = NULL;
-        psImageCovarianceTransfer(outRO->variance, outRO->covariance);
     }