Changeset 24892

Timestamp:

Jul 22, 2009, 9:33:24 AM (17 years ago)

Author:

Paul Price

Message:

Cleaning up pattern noise subtraction code.

Location:

trunk

Files:

• ippconfig/recipes/ppImage.config (modified) (3 diffs)
• ppImage/src/ppImage.h (modified) (3 diffs)
• ppImage/src/ppImageDetrendReadout.c (modified) (1 diff)
• ppImage/src/ppImageOptions.c (modified) (4 diffs)

trunk/ippconfig/recipes/ppImage.config

@@ -17 +17 @@
 MASK.LOW           BOOL    TRUE            # Mask pixels below valid range
 VARIANCE.BUILD     BOOL    FALSE           # Build internal variance image
+PATTERN            BOOL    FALSE           # Fit and remove pattern noise?
 FRINGE             BOOL    FALSE           # Fringe subtraction
 PHOTOM             BOOL    FALSE           # Source identification and photometry
@@ -25 +26 @@
 USE.DEBURNED.IMAGE BOOL    FALSE           # use burntool-repaired image?
 TILTYSTREAK.APPLY  BOOL    FALSE           # apply the 'tiltystreak' tool
-
-PATTERN            BOOL    FALSE           # Fit and remove pattern noise?
-PATTERN.ORDER      S32     1               # Polynomial order
-PATTERN.ITER       S32     3               # Rejection iterations
-PATTERN.REJ        F32     2.0             # Rejection threshold
-PATTERN.MEAN       STR     ROBUST_MEDIAN   # Statistic for mean
-PATTERN.STDEV      STR     ROBUST_STDEV    # Statistic for standard deviation
 
 
@@ -86 +80 @@
 OVERSCAN.CONSTANT       BOOL    FALSE           # Apply a known, fixed value?
 OVERSCAN.VALUE          F32     0.0             # value to apply, if requested
+
+# Pattern subtraction options
+PATTERN.ORDER      S32     2               # Polynomial order
+PATTERN.ITER       S32     4               # Rejection iterations
+PATTERN.REJ        F32     2.5             # Rejection threshold
+PATTERN.MEAN       STR     SAMPLE_MEAN     # Statistic for mean
+PATTERN.STDEV      STR     SAMPLE_STDEV    # Statistic for standard deviation
 
 # Fringe subtraction options

trunk/ppImage/src/ppImage.h

@@ -37 +37 @@
     bool doShutter;                     // Shutter correction
     bool doFlat;                        // Flat-field normalisation
+    bool doPattern;                     // Pattern noise subtraction
     bool doFringe;                      // Fringe subtraction
     bool doPhotom;                      // Source identification and photometry
@@ -44 +45 @@
     bool doStats;                       // call ppStats on the image
     bool checkCTE;                      // measure pixel-based variance
-    bool applyParity;                   // Apply Cell parities
+    bool applyParity;                   // Apply Cell parities
 
     bool doCrosstalkMeasure;            // measure crosstalk signal
@@ -93 +94 @@
     float fringeKeep;                   // Fringe keep fraction
 
+    // Pattern noise subtraction
+    int patternOrder;                   // Polynomial order
+    int patternIter;                    // Clipping iterations
+    float patternRej;                   // Clipping threshold
+    psStatsOptions patternMean;         // Statistic for mean
+    psStatsOptions patternStdev;        // Statistic for stdev
+
     int remnanceSize;                   // Size for remnance detection
     float remnanceThresh;               // Threshold for remnance detection

trunk/ppImage/src/ppImageDetrendReadout.c

@@ -126 +126 @@
     // Pattern noise correction
     if (options->doPattern) {
-        if (!pmPatternRow(input, options->patternOrder, 
-options->patternIter, options->patternRej, options->patternMean, 
-options->patternStdev)) {
-                psFree(detview);
-                return false;
-            }
-        }
-
+        if (!pmPatternRow(input, options->patternOrder, options->patternIter, options->patternRej,
+                          options->patternMean, options->patternStdev)) {
+            psFree(detview);
+            return false;
+        }
+    }
 
     // Normalization by a single (known) constant

trunk/ppImage/src/ppImageOptions.c

@@ -31 +31 @@
     options->doShutter       = false;   // Shutter correction
     options->doFlat          = false;   // Flat-field normalisation
+    options->doPattern       = false;   // Pattern noise subtraction
     options->doFringe        = false;   // Fringe subtraction
     options->doPhotom        = false;   // Source identification and photometry
@@ -86 +87 @@
     options->fringeIter      = 0;       // Fringe iterations
     options->fringeKeep      = 1.0;     // Fringe keep fraction
+
+    // Pattern noise values
+
+    options->patternOrder    = 0;       // Polynomial order
+    options->patternIter     = 0;       // Clipping iterations
+    options->patternRej      = NAN;     // Clipping rejection threshold
+    options->patternMean     = PS_STAT_NONE; // Statistic for mean
+    options->patternStdev    = PS_STAT_NONE; // Statistic for standard deviation
 
     // Remnance values
@@ -225 +234 @@
     options->doFringe = psMetadataLookupBool(NULL, recipe, "FRINGE");
     options->doShutter = psMetadataLookupBool(NULL, recipe, "SHUTTER");
+    options->doPattern = psMetadataLookupBool(NULL, recipe, "PATTERN");
 
     options->doStats = false;
@@ -298 +308 @@
     options->fringeKeep = psMetadataLookupF32(NULL, recipe, "FRINGE.KEEP");
 
+    // Pattern noise
+    options->patternOrder = psMetadataLookupS32(NULL, recipe, "PATTERN.ORDER");
+    options->patternIter = psMetadataLookupS32(NULL, recipe, "PATTERN.ITER");
+    options->patternRej = psMetadataLookupF32(NULL, recipe, "PATTERN.REJ");
+    options->patternMean = psStatsOptionFromString(psMetadataLookupStr(NULL, recipe, "PATTERN.MEAN"));
+    options->patternStdev = psStatsOptionFromString(psMetadataLookupStr(NULL, recipe, "PATTERN.STDEV"));
+
     // Remnance options
     options->remnanceSize = psMetadataLookupF32(NULL, recipe, "REMNANCE.SIZE");