Changeset 25911 for branches/pap/ppStack/src/ppStackConvolve.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/ppStackConvolve.c (modified) (3 diffs)

branches/pap/ppStack/src/ppStackConvolve.c

@@ -39 +39 @@
     options->weightings = psVectorAlloc(num, PS_TYPE_F32); // Combination weightings for images (1/noise^2)
     psVectorInit(options->weightings, 0.0);
-    options->covariances = psArrayAlloc(num); // Covariance matrices
+    options->origCovars = psArrayAlloc(num);
+    options->convCovars = psArrayAlloc(num); // Covariance matrices
 
     psList *fpaList = psListAlloc(NULL); // List of input FPAs, for concept averaging
@@ -79 +80 @@
         // Background subtraction, scaling and normalisation is performed automatically by the image matching
         psTimerStart("PPSTACK_MATCH");
+        options->origCovars->data[i] = psMemIncrRefCounter(readout->covariance);
         if (!ppStackMatch(readout, options, i, config)) {
             psErrorStackPrint(stderr, "Unable to match image %d --- ignoring.", i);
@@ -85 +87 @@
             continue;
         }
-        options->covariances->data[i] = psMemIncrRefCounter(readout->covariance);
+        options->convCovars->data[i] = psMemIncrRefCounter(readout->covariance);
 
         if (options->stats) {