Changeset 38233 for trunk/ppImage/src

Timestamp:

May 6, 2015, 6:14:49 AM (11 years ago)

Author:

eugene

Message:

add squash nan option

Location:

trunk/ppImage/src

Files:

• Makefile.am (modified) (1 diff)
• ppImage.h (modified) (5 diffs)
• ppImageLoop.c (modified) (1 diff)
• ppImageOptions.c (modified) (2 diffs)
• ppImageSquashNANs.c (added)

trunk/ppImage/src/Makefile.am

@@ -50 +50 @@
         ppImageMemory.c \
         ppImageAddNoise.c \
+        ppImageSquashNANs.c \
         ppImageRandomGaussian.c \
         ppImageAuxiliaryMask.c \

trunk/ppImage/src/ppImage.h

@@ -52 +52 @@
     bool checkCTE;                      // measure pixel-based variance
     bool checkNoise;                    // measure cell-level variance
+    bool squashNANs;                    // measure cell-level variance
     bool applyParity;                   // Apply Cell parities
     bool doMaskStats;                   // Calculate mask statistics
@@ -59 +60 @@
     bool addNoise;                      // Add noise to degrade MD image to 3pi
 
-  bool hasVideo;                      // Determine if this OTA has a video cell
-  bool useVideoDark;                  // Should we use a video dark if we can?
-  bool useVideoMask;                  // Should we use a video mask if we can?
+    bool hasVideo;                      // Determine if this OTA has a video cell
+    bool useVideoDark;                  // Should we use a video dark if we can?
+    bool useVideoMask;                  // Should we use a video mask if we can?
   
     // output files requested
@@ -117 +118 @@
     psStatsOptions patternCellMean;        // Statistic for mean
 
-  int patternContinuityEdgeWidth;        // Size of box to use for edge matching.
+    int patternContinuityEdgeWidth;        // Size of box to use for edge matching.
   
     int remnanceSize;                   // Size for remnance detection
@@ -124 +125 @@
     char *normClass;                    // class to use for per-class normalization
 
-  psU16 maskstat_static;
-  psU16 maskstat_dynamic;
-  psU16 maskstat_magic;
-  psU16 maskstat_advisory;
-
-  psString auxVideoMask;                // auxillary video mask file
+    psU16 maskstat_static;
+    psU16 maskstat_dynamic;
+    psU16 maskstat_magic;
+    psU16 maskstat_advisory;
+
+    psString auxVideoMask;                // auxillary video mask file
   
 } ppImageOptions;
@@ -183 +184 @@
 bool ppImageCheckNoise(pmConfig *config, ppImageOptions *options, pmFPAview *view);
 
+bool ppImageSquashNANs(pmConfig *config, ppImageOptions *options, pmFPAview *view);
+
 bool ppImageBurntoolMask(pmConfig *config, ppImageOptions *options, pmFPAview *view, pmReadout *readout);
 bool ppImageBurntoolMaskFromTable(pmConfig *config, ppImageOptions *options, pmFPAview *view, pmReadout *readout);

trunk/ppImage/src/ppImageLoop.c

@@ -133 +133 @@
                 if (!ppImageAddNoise(config, options, view, input->fpa)){
                     ESCAPE("Unable to degrade MD image to 3pi");
+                }
+
+
+                if (!ppImageSquashNANs(config, options, view)) {
+                    ESCAPE("Unable to squash NAN pixels");
                 }
 

trunk/ppImage/src/ppImageOptions.c

@@ -46 +46 @@
     options->checkCTE        = false;   // Measure pixel-based variance
     options->checkNoise      = false;   // Measure cell-level variances.
+    options->squashNANs      = false;   // Measure cell-level variances.
     options->applyParity     = false;   // Apply Cell parities
     options->doMaskStats     = false;   // Calculate mask fractions
@@ -340 +341 @@
     options->checkCTE       = psMetadataLookupBool(NULL, recipe, "CHECK.CTE");
     options->checkNoise     = psMetadataLookupBool(NULL, recipe, "CHECK.NOISE");
+    options->squashNANs     = psMetadataLookupBool(NULL, recipe, "SQUASH.NANS");
 
     /* doMaskBuild : there are some cases where we require a mask, so we force doMaskBuild to be set even if the user specified 'FALSE'