Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/ppImage/src/ppImage.h

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

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

branches/cnb_branches/cnb_branch_20090301/ppImage/src

@@ -9 +9 @@
 stamp-h1
 .libs
+ppImageVersionDefinitions.h

@@ -9 +9 @@
 stamp-h1
 .libs
+ppImageVersionDefinitions.h

branches/cnb_branches/cnb_branch_20090301/ppImage/src/ppImage.h

@@ -26 +26 @@
     bool doMaskBuild;                   // Build internal mask
     bool doVarianceBuild;               // Build internal variance map
+    bool doMaskSat;                     // mask saturated pixels
+    bool doMaskLow;                     // mask low pixels
     bool doMask;                        // Mask bad pixels
     bool doNonLin;                      // Non-linearity correction
@@ -40 +42 @@
     bool doAstromMosaic;                // full-mosaic Astrometry
     bool doStats;                       // call ppStats on the image
+    bool checkCTE;                      // measure pixel-based variance
+    bool applyParity;                   // Apply Cell parities
+
+    bool doCrosstalkMeasure;            // measure crosstalk signal
+    bool doCrosstalkCorrect;            // apply crosstalk correction
 
     // output files requested
@@ -61 +68 @@
     psImageMaskType markValue;          // apply this bit-mask to choose masked bits
     psImageMaskType satMask;            // Mask value to give saturated pixels
-    psImageMaskType badMask;            // Mask value to give bad pixels
+    psImageMaskType lowMask;            // Mask value to give bad pixels
     psImageMaskType flatMask;           // Mask value to give bad flat pixels
+    psImageMaskType darkMask;           // Mask value to give bad dark pixels
     psImageMaskType blankMask;          // Mask value to give blank pixels
 
@@ -87 +95 @@
     float remnanceThresh;               // Threshold for remnance detection
 
-    char *normClass;                    // class to use for per-class normalization 
+    char *normClass;                    // class to use for per-class normalization
 } ppImageOptions;
 
@@ -111 +119 @@
 bool ppImageSetMaskBits (pmConfig *config, ppImageOptions *options);
 
+// apply the cell flips to the input data before analysis
+bool ppImageParityFlip (pmConfig *config, const ppImageOptions *options, const pmFPAview *view);
+
 // Loop over the input
 bool ppImageLoop(pmConfig *config, ppImageOptions *options);
@@ -132 +143 @@
 bool ppImageDetrendFree(pmConfig *config, pmFPAview *view);
 bool ppImageFringeFree(pmConfig *config, pmFPAview *view);
+
+bool ppImageCheckCTE(pmConfig *config, ppImageOptions *options, pmFPAview *view);
 
 // Record which detrend file was used for the detrending
@@ -143 +156 @@
 bool ppImageRebinChip (pmConfig *config, pmFPAview *view, ppImageOptions *options, char *outName);
 
-bool ppImagePhotom (pmConfig *config, pmFPAview *view);
-bool ppImageAstrom (pmConfig *config);
-bool ppImageAddstar (pmConfig *config);
+bool ppImagePhotom(psMetadata *stats, pmConfig *config, pmFPAview *view);
+bool ppImageAstrom(pmConfig *config, psMetadata *stats);
+bool ppImageAddstar(pmConfig *config);
 
 // Subtract background from the chip-mosaicked image
@@ -180 +193 @@
 
 
+// measure the crosstalk signal
+bool ppImageMeasureCrosstalk(pmConfig *config, ppImageOptions *options, pmFPAview *view);
+
+// correct the crosstalk signal
+bool ppImageCorrectCrosstalk(pmConfig *config, ppImageOptions *options, pmFPAview *view);
+
 // Measure fringes
 bool ppImageDetrendFringeMeasure(pmReadout *readout, // Readout to measure

@@ -9 +9 @@
 stamp-h1
 .libs
+ppImageVersionDefinitions.h