Changeset 20494 for trunk/ppStack/src/ppStackMatch.c

Timestamp:

Oct 31, 2008, 4:05:48 PM (18 years ago)

Author:

Paul Price

Message:

Adding variance map renormalisation.

File:

• trunk/ppStack/src/ppStackMatch.c (modified) (4 diffs)

trunk/ppStack/src/ppStackMatch.c

@@ -17 +17 @@
 
 //#define TESTING                         // Enable debugging output
-
-
 
 #ifdef TESTING
@@ -339 +337 @@
     assert((*regions)->n == (*kernels)->n);
 
-    // Correct the variance for the chi^2
+    // Record chi^2
     {
         *chi2 = 0.0;
@@ -358 +356 @@
         float vf = psMetadataLookupF32(NULL, readout->parent->concepts, "CELL.VARFACTOR"); // Variance factor
         *chi2 /= vf * num;
-        psLogMsg("ppStack", PS_LOG_INFO, "Additional variance from chi^2: %f", *chi2);
     }
 
@@ -368 +365 @@
         psStatsOptions renormStdev = psStatsOptionFromString(psMetadataLookupStr(&mdok, recipe,
                                                                                  "RENORM.STDEV"));
-        int renormWidth = psMetadataLookupS32(&mdok, recipe, "RENORM.WIDTH"); // Width for renormalisation box
-
-        psLogMsg("ppStack", PS_LOG_INFO, "Renormalising variance map.");
-        if (!pmReadoutWeightRenorm(readout, maskBad, renormMean, renormStdev, renormWidth, rng)) {
+
+        if (!pmReadoutWeightRenormPixels(readout, maskBad, renormMean, renormStdev, rng)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to renormalise variances.");
             psFree(output);