Changeset 28043 for trunk/ppImage/src

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/Makefile.am (modified) (1 diff)
• ppImage/src/ppImage.h (modified) (3 diffs)
• ppImage/src/ppImageLoop.c (modified) (2 diffs)
• ppImage/src/ppImageMaskStats.c (copied) (copied from branches/czw_branch/20100427/ppImage/src/ppImageMaskStats.c )
• ppImage/src/ppImageOptions.c (modified) (3 diffs)
• ppImage/src/ppImageVersion.c (modified) (1 diff)

trunk/ppImage/src/Makefile.am

@@ -44 +44 @@
         ppImageRebinReadout.c \
         ppImageMosaic.c \
+        ppImageMaskStats.c \
         ppImagePhotom.c \
         ppImageAstrom.c \

trunk/ppImage/src/ppImage.h

@@ -49 +49 @@
     bool applyParity;                   // Apply Cell parities
 
+  bool doMaskStats;                      // Calculate mask statistics
+  
     bool doCrosstalkMeasure;            // measure crosstalk signal
     bool doCrosstalkCorrect;            // apply crosstalk correction
@@ -110 +112 @@
 
     char *normClass;                    // class to use for per-class normalization
+
+  psU16 maskstat_static;
+  psU16 maskstat_dynamic;
+  psU16 maskstat_magic;
+  psU16 maskstat_advisory;
+  
 } ppImageOptions;
 
@@ -268 +276 @@
     );
 
+// Calculate Mask statistics
+bool ppImageMaskStats(pmConfig *config, pmFPAview *view, psMetadata *stats);
+
 // calculate stats from headers and concepts
 bool ppImageMetadataStats(pmConfig *config, // Configuration

trunk/ppImage/src/ppImageLoop.c

@@ -196 +196 @@
         }
 
+        if (options->doMaskStats) {
+          //if (!ppImageMaskStats(config, view, options)) {
+          if (!ppImageMaskStats(config, view, stats)) {
+            ESCAPE("Unable to do Mask stats");
+          }
+        }
+        
         // these may be used by ppImageSubtractBackground.
         // if these are defined as internal files, drop them here
@@ -252 +259 @@
         ppImageFileCheck(config);
     }
-
+    
     // Calculate summary statistics from FPA Metadata
     if (!ppImageMetadataStats(config, stats, options)) {

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;
 }

trunk/ppImage/src/ppImageVersion.c

@@ -68 +68 @@
     psString source  = ppImageSource();  // ppImage software source
 
+    psMetadataAddStr(header, PS_LIST_TAIL, "IMAGE_V", PS_META_REPLACE, NULL, PPIMAGE_VERSION);
+    
     psStringPrepend(&version, "ppImage version: ");
     psStringPrepend(&source, "ppImage source: ");