Changeset 25406 for branches/eam_branches/20090715/ppStack/src/ppStackCombineFinal.c

Timestamp:

Sep 15, 2009, 4:02:42 PM (17 years ago)

Author:

eugene

Message:

updates from trunk

File:

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

branches/eam_branches/20090715/ppStack/src/ppStackCombineFinal.c

@@ -56 +56 @@
         }
         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;
     }
-    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);
+    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);
+    }
 
 #ifdef TESTING