Changeset 19599

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.

Location:

trunk/ppStack/src

Files:

• ppStackArguments.c (modified) (2 diffs)
• ppStackMatch.c (modified) (2 diffs)

trunk/ppStack/src/ppStackArguments.c

@@ -81 +81 @@
     psMaskType value = pmConfigMaskGet(name, config); \
     psMetadataAddU8(recipe, PS_LIST_TAIL, RECIPENAME, PS_META_REPLACE, NULL, value); \
-}
-
-// Get a statistic name from the command-line or recipe, and add the enum to the arguments
-#define VALUE_ARG_RECIPE_STAT(ARGNAME, RECIPENAME) { \
-    const char *stat = psMetadataLookupStr(NULL, config->arguments, ARGNAME); \
-    if (!stat) { \
-        stat = psMetadataLookupStr(NULL, recipe, RECIPENAME); \
-        if (!stat) { \
-            psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Unable to find %s in recipe %s", \
-                    RECIPENAME, PPSTACK_RECIPE); \
-            goto ERROR; \
-        } \
-    } \
-    psMetadataAddS32(recipe, PS_LIST_TAIL, RECIPENAME, PS_META_REPLACE, \
-                     NULL, psStatsOptionFromString(stat)); \
 }
 
@@ -281 +266 @@
     }
     VALUE_ARG_RECIPE_INT("-renorm-width", "RENORM.WIDTH", S32, 0);
-    VALUE_ARG_RECIPE_STAT("-renorm-mean", "RENORM.MEAN");
-    VALUE_ARG_RECIPE_STAT("-renorm-stdev", "RENORM.STDEV");
+    valueArgRecipeStr(arguments, recipe, "-renorm-mean", "RENORM.MEAN", recipe);
+    valueArgRecipeStr(arguments, recipe, "-renorm-stdev", "RENORM.STDEV", recipe);
 
     valueArgRecipeStr(arguments, recipe, "-temp-image",  "TEMP.IMAGE",  recipe);

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)) {