Changeset 28043 for trunk/ppImage/src/ppImageOptions.c

Timestamp:

May 19, 2010, 5:13:52 PM (16 years ago)

Author:

watersc1

Message:

Merging czw_branch (maskstats and software versions) back into the trunk

Location:

trunk

Files:

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

trunk/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
@@ -243 +244 @@
     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 +343 @@
     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;
 }