Changeset 27840 for branches/simtest_nebulous_branches/ppImage/src/ppImage.h

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• ppImage/src/ppImage.h (modified) (7 diffs)

branches/simtest_nebulous_branches/ppImage/src/ppImage.h

@@ -26 +26 @@
     bool doMaskBuild;                   // Build internal mask
     bool doVarianceBuild;               // Build internal variance map
+    bool doMaskBurntool;                // mask potential burntool trails
     bool doMaskSat;                     // mask saturated pixels
     bool doMaskLow;                     // mask low pixels
@@ -37 +38 @@
     bool doShutter;                     // Shutter correction
     bool doFlat;                        // Flat-field normalisation
-    bool doPattern;                     // Pattern noise subtraction
+    bool doPatternRow;                  // Row pattern correction
+    bool doPatternCell;                 // Cell pattern correction
     bool doFringe;                      // Fringe subtraction
     bool doPhotom;                      // Source identification and photometry
@@ -74 +76 @@
     psImageMaskType darkMask;           // Mask value to give bad dark pixels
     psImageMaskType blankMask;          // Mask value to give blank pixels
-
+    psImageMaskType burntoolMask;       // Suspect pixels that fall where a burntool trail is expected.
     // non-linear correction parameters
     psDataType nonLinearType;
@@ -82 +84 @@
     // options for the analysis
     pmOverscanOptions *overscan;        // Overscan options
-
+    int burntoolTrails;
     // binning parameters
     int xBin1;                          // x-binning, scale 1
@@ -94 +96 @@
     float fringeKeep;                   // Fringe keep fraction
 
-    // Pattern noise subtraction
-    int patternOrder;                   // Polynomial order
-    int patternIter;                    // Clipping iterations
-    float patternRej;                   // Clipping threshold
-    float patternThresh;                // Ignore threshold
-    psStatsOptions patternMean;         // Statistic for mean
-    psStatsOptions patternStdev;        // Statistic for stdev
+    // Pattern correction
+    int patternRowOrder;                   // Polynomial order
+    int patternRowIter;                    // Clipping iterations
+    float patternRowRej;                   // Clipping threshold
+    float patternRowThresh;                // Ignore threshold
+    psStatsOptions patternRowMean;         // Statistic for mean
+    psStatsOptions patternRowStdev;        // Statistic for stdev
+    psStatsOptions patternCellBG;          // statistic for background
+    psStatsOptions patternCellMean;        // Statistic for mean
 
     int remnanceSize;                   // Size for remnance detection
@@ -130 +134 @@
 
 // apply the cell flips to the input data before analysis
-bool ppImageParityFlip (pmConfig *config, const ppImageOptions *options, const pmFPAview *view);
+bool ppImageParityFlip (pmConfig *config, const ppImageOptions *options, const pmFPAview *view, bool native);
 
 // Loop over the input
@@ -155 +159 @@
 
 bool ppImageCheckCTE(pmConfig *config, ppImageOptions *options, pmFPAview *view);
+
+bool ppImageBurntoolMask(pmConfig *config, ppImageOptions *options, pmFPAview *view, pmReadout *mask);
+
+bool ppImageDetrendPatternApply(pmConfig *config, pmChip *chip, const pmFPAview *inputView, const ppImageOptions *options);
 
 // Record which detrend file was used for the detrending