Changeset 28017 for branches/czw_branch/20100427/ppImage/src/ppImageOptions.c

Timestamp:

May 18, 2010, 5:06:01 PM (16 years ago)

Author:

watersc1

Message:

Almost working version of the mask-stats/software revision code.

Almost.

Location:

branches/czw_branch/20100427

Files:

• . (modified) (1 prop)
• ppImage/src/ppImageOptions.c (modified) (4 diffs)

branches/czw_branch/20100427/ppImage/src/ppImageOptions.c

@@ -41 +41 @@
     options->checkCTE        = false;   // Measure pixel-based variance
     options->applyParity     = false;   // Apply Cell parities
-
+    options->doMaskStats     = false;   // Calculate mask fractions
+    
     // output files requested
     options->BaseFITS        = false;   // create output image
@@ -108 +109 @@
     // per-class normalization source
     options->normClass       = NULL;    // per-class normalizations refer to this class
+
+    // Mask stats options
+    options->maskstat_static = 0;       // static masks
+    options->maskstat_dynamic = 0;      // dynamic masks
+    options->maskstat_magic = 0;        // magic masks
+    options->maskstat_advisory = 0;     // advisory masks
 
     return options;
@@ -243 +250 @@
     options->doPatternRow = psMetadataLookupBool(NULL, recipe, "PATTERN.ROW");
     options->doPatternCell = psMetadataLookupBool(NULL, recipe, "PATTERN.CELL");
+    options->doMaskStats = psMetadataLookupBool(NULL, recipe, "MASK.STATS");
 
     options->doStats = false;
@@ -341 +349 @@
     options->normClass = psMetadataLookupStr(NULL, recipe, "NORM.CLASS");
 
+    options->maskstat_static   = psMetadataLookupU16(NULL, recipe, "MASKSTAT.STATIC");
+    options->maskstat_dynamic  = psMetadataLookupU16(NULL, recipe, "MASKSTAT.DYNAMIC");
+    options->maskstat_magic    = psMetadataLookupU16(NULL, recipe, "MASKSTAT.MAGIC");
+    options->maskstat_advisory = psMetadataLookupU16(NULL, recipe, "MASKSTAT.ADVISORY");
+
+    
     return options;
 }