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

Timestamp:

Sep 18, 2008, 9:38:38 AM (18 years ago)

Author:

Paul Price

Message:

For the update system, can't change the type of what's on the recipe.

File:

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

trunk/ppStack/src/ppStackMatch.c

@@ -72 +72 @@
     bool mdok;                          // Status of MD lookup
     bool renorm = psMetadataLookupBool(&mdok, recipe, "RENORM"); // Renormalise variances?
-    psStatsOptions renormMean = psMetadataLookupS32(&mdok, recipe, "RENORM.MEAN"); // Statistic for mean
-    psStatsOptions renormStdev = psMetadataLookupS32(&mdok, recipe, "RENORM.STDEV"); // Statistic for stdev
-    int renormWidth = psMetadataLookupS32(&mdok, recipe, "RENORM.WIDTH"); // Width for renormalisation box
     float penalty = psMetadataLookupF32(NULL, ppsub, "PENALTY"); // Penalty for wideness
     int threads = psMetadataLookupS32(NULL, config->arguments, "-threads"); // Number of threads
@@ -364 +361 @@
     // Renormalise the variances if desired
     if (renorm) {
+        // Statistics for renormalisation
+        psStatsOptions renormMean = psStatsOptionFromString(psMetadataLookupStr(&mdok, recipe,
+                                                                                "RENORM.MEAN"));
+        psStatsOptions renormStdev = psStatsOptionFromString(psMetadataLookupS32(&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)) {