Changeset 25955 for branches/pap/ppStack/src/ppStackConvolve.c

Timestamp:

Oct 27, 2009, 1:31:32 PM (17 years ago)

Author:

Paul Price

Message:

Need to correct chi^{2 for the renormalisation, otherwise we're double-renormalising.}

File:

• branches/pap/ppStack/src/ppStackConvolve.c (modified) (3 diffs)

branches/pap/ppStack/src/ppStackConvolve.c

@@ -42 +42 @@
     options->convCovars = psArrayAlloc(num); // Covariance matrices
 
+    psVector *renorms = psVectorAlloc(num, PS_TYPE_F32); // Renormalisation values for variances
+    psVectorInit(renorms, NAN);
+
     psList *fpaList = psListAlloc(NULL); // List of input FPAs, for concept averaging
     psList *cellList = psListAlloc(NULL); // List of input cells, for concept averaging
@@ -88 +91 @@
         }
         options->convCovars->data[i] = psMemIncrRefCounter(readout->covariance);
+
+        float renorm = psMetadataLookupF32(NULL, readout->analysis, PM_READOUT_ANALYSIS_RENORM);
+        if (!isfinite(renorm)) {
+            renorm = 1.0;
+        }
+        renorms->data.F32[i] = renorm;
 
         if (options->stats) {
@@ -234 +243 @@
     }
 
+    // Correct chi^2 for renormalisation
+    psBinaryOp(options->matchChi2, options->matchChi2, "/", renorms);
+    psFree(renorms);
+
     return true;
 }