Changeset 18558 for trunk/ppStats

Timestamp:

Jul 15, 2008, 10:29:11 AM (18 years ago)

Author:

eugene

Message:

re-org and cleanup of the mask bits to make it consistent with the pmConfigMaskSetBits concepts

Location:

trunk/ppStats/src

Files:

• ppStatsFPA.c (modified) (1 diff)
• ppStatsMetadata.c (modified) (1 diff)
• ppStatsPixels.c (modified) (1 diff)
• ppStatsSetupFromRecipe.c (modified) (1 diff)

trunk/ppStats/src/ppStatsFPA.c

@@ -21 +21 @@
     }
 
-    // Override recipe mask value if one is provided
-    if (maskVal != 0) {
-        data->maskVal = maskVal;
-    }
+    // Override recipe mask value
+    data->maskVal = maskVal;
 
     if (data->fpa) {

trunk/ppStats/src/ppStatsMetadata.c

@@ -29 +29 @@
     data->doStats = false;
 
-    // Override recipe mask value if one is provided
-    if (maskVal != 0) {
-        data->maskVal = maskVal;
-    }
+    // Override recipe mask value
+    data->maskVal = maskVal;
 
     if (data->fpa) {

trunk/ppStats/src/ppStatsPixels.c

@@ -28 +28 @@
     data->concepts = psListAlloc(NULL);
 
-    // Override recipe mask value if one is provided
-    if (maskVal != 0) {
-        data->maskVal = maskVal;
-    }
+    // Override recipe mask value 
+    data->maskVal = maskVal;
 
     if (data->fpa) {

trunk/ppStats/src/ppStatsSetupFromRecipe.c

@@ -127 +127 @@
     }
 
+    // set the mask value used for stand-alone analyses.
     if (data->maskVal == 0) {
         const char *names = psMetadataLookupStr(&mdok, recipe, "MASKVAL"); // Names for mask value
         if (mdok) {
-            data->maskVal = pmConfigMask(names, config);
+            data->maskVal = pmConfigMaskGet(names, config);
         } else {
             psWarning("MASKVAL in recipe is not of type STR --- retaining default.\n");