Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/ppStack/src/ppStackCombineFinal.c

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

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

branches/cnb_branches/cnb_branch_20090301/ppStack/src

@@ -9 +9 @@
 config.h.in
 stamp-h1
+ppStackVersionDefinitions.h

@@ -9 +9 @@
 config.h.in
 stamp-h1
+ppStackVersionDefinitions.h

branches/cnb_branches/cnb_branch_20090301/ppStack/src/ppStackCombineFinal.c

@@ -47 +47 @@
     }
 
+    // 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;
+        }
+        psKernel *covar = options->covariances->data[i]; // Covariance matrix
+        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);
+
 #ifdef TESTING
     pmStackVisualPlotTestImage(outRO->image, "combined_initial.fits");

@@ -9 +9 @@
 config.h.in
 stamp-h1
+ppStackVersionDefinitions.h