Changeset 23767

Timestamp:

Apr 9, 2009, 9:50:48 AM (17 years ago)

Author:

Paul Price

Message:

Covariance matrices should be averaged (otherwise, central value is N instead of 1, but stacking the covariance matrices shouldn't change the scale of the variance). Also, this operation should be done after the final rejection of images, not before (or images that weren't rejected might be included when they shouldn't be).

Location:

trunk/ppStack/src

Files:

• ppStackCombineFinal.c (modified) (1 diff)
• ppStackCombineInitial.c (modified) (1 diff)

trunk/ppStack/src/ppStackCombineFinal.c

@@ -47 +47 @@
     }
 
+    // Sum covariance matrices
+    for (int i = 0; i < options->num; i++) {
+        if (options->inputMask->data.U8[i]) {
+            psFree(options->covariances->data[i]);
+            options->covariances->data[i] = NULL;
+        }
+    }
+    options->outRO->covariance = psImageCovarianceAverage(options->covariances);
+    psFree(options->covariances); options->covariances = NULL;
+
 #ifdef TESTING
     pmStackVisualPlotTestImage(outRO->image, "combined_initial.fits");

trunk/ppStack/src/ppStackCombineInitial.c

@@ -87 +87 @@
 #endif
 
-    // Sum covariance matrices
-    for (int i = 0; i < options->num; i++) {
-        if (options->inputMask->data.U8[i]) {
-            psFree(options->covariances->data[i]);
-            options->covariances->data[i] = NULL;
-        }
-    }
-    options->outRO->covariance = psImageCovarianceSum(options->covariances);
-    psFree(options->covariances); options->covariances = NULL;
     psFree(options->matchChi2); options->matchChi2 = NULL;