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

Timestamp:

Feb 17, 2009, 3:38:42 PM (17 years ago)

Author:

Paul Price

Message:

Removing normalisation of the variance maps --- the covariance matrix provides the correct answer.

File:

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

trunk/ppStack/src/ppStackMatch.c

@@ -189 +189 @@
 
     bool mdok;                          // Status of MD lookup
-    bool renorm = psMetadataLookupBool(&mdok, recipe, "RENORM"); // Renormalise variances?
     float penalty = psMetadataLookupF32(NULL, ppsub, "PENALTY"); // Penalty for wideness
     int threads = psMetadataLookupS32(NULL, config->arguments, "-threads"); // Number of threads
@@ -374 +373 @@
             }
 #endif
-
-            // Renormalise the variances if desired
-            if (renorm) {
-                // Statistics for renormalisation
-                psStatsOptions renormMean = psStatsOptionFromString(psMetadataLookupStr(&mdok, recipe,
-                                                                                        "RENORM.MEAN"));
-                psStatsOptions renormStdev = psStatsOptionFromString(psMetadataLookupStr(&mdok, recipe,
-                                                                                         "RENORM.STDEV"));
-
-                if (!pmReadoutVarianceRenormPixels(readout, maskBad, renormMean, renormStdev, rng)) {
-                    psError(PS_ERR_UNKNOWN, false, "Unable to renormalise variances.");
-                    psFree(output);
-                    return false;
-                }
-            }
 
             if (threads > 0) {
@@ -562 +546 @@
     }
 
-    // Renormalise the variances if desired
-    if (renorm) {
-        // Statistics for renormalisation
-        psStatsOptions renormMean = psStatsOptionFromString(psMetadataLookupStr(&mdok, recipe,
-                                                                                "RENORM.MEAN"));
-        psStatsOptions renormStdev = psStatsOptionFromString(psMetadataLookupStr(&mdok, recipe,
-                                                                                 "RENORM.STDEV"));
-
-        if (!pmReadoutVarianceRenormPixels(readout, maskBad, renormMean, renormStdev, rng)) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to renormalise variances.");
-            psFree(output);
-            return false;
-        }
-    }
-
     // Ensure the background value is zero
     psStats *bg = psStatsAlloc(PS_STAT_ROBUST_MEDIAN | PS_STAT_ROBUST_STDEV); // Statistics for background