Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/ppImage/src/ppImageOptions.c

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/ppImageOptions.c (modified) (5 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/ppImageOptions.c

@@ -19 +19 @@
     // actions which ppImage should perform
     options->doMaskBuild     = false;   // Build internal mask
-    options->doVarianceBuild   = false;   // Build internal variance
+    options->doMaskSat       = false;   // mask saturated pixels
+    options->doMaskLow       = false;   // mask low pixels
+    options->doVarianceBuild = false;   // Build internal variance
     options->doMask          = false;   // Mask bad pixels
     options->doNonLin        = false;   // Non-linearity correction
@@ -33 +35 @@
     options->doAstromMosaic  = false;   // Astrometry (full-mosaic)
     options->doStats         = false;   // Measure and save image statistics
+    options->applyParity     = false;   // Apply Cell parities
 
     // output files requested
@@ -53 +56 @@
     options->maskValue       = 0x00;    // Default mask value (used to skip / ignore pixels)
     options->satMask         = 0x00;    // Saturated pixels (supplied to pmReadoutGenerateMask)
-    options->badMask         = 0x00;    // Bad (low) pixels (supplied to pmReadoutGenerateMask)
+    options->lowMask         = 0x00;    // out-of-bounds (low) pixels (supplied to pmReadoutGenerateMask)
     options->flatMask        = 0x00;    // Bad flat pixels (supplied to pmFlatField)
+    options->darkMask        = 0x00;    // Bad dark pixels (supplied to pmDarkApply)
     options->blankMask       = 0x00;    // Blank (no data, cell gap) pixels (supplied to pmChipMosaic, pmFPAMosaic)
     options->markValue       = 0x00;    // A safe bit for internal marking
+
+    // crosstalk options
+    options->doCrosstalkMeasure = false;   // measure crosstalk
+    options->doCrosstalkCorrect = false;   // correct crosstalk
 
     // Non-linearity default options
@@ -197 +205 @@
     // for these images, even if not required otherwise
     options->doMaskBuild = psMetadataLookupBool(NULL, recipe, "MASK.BUILD");
+    options->doMaskSat   = psMetadataLookupBool(NULL, recipe, "MASK.SATURATED");
+    options->doMaskLow   = psMetadataLookupBool(NULL, recipe, "MASK.LOW");
     options->doVarianceBuild = psMetadataLookupBool(NULL, recipe, "VARIANCE.BUILD");
 
     // Mask recipe options (note that mask bit values are set in ppImageSetMaskBits.c)
     options->doMask = psMetadataLookupBool(NULL, recipe, "MASK");
+
+    // Mask recipe options (note that mask bit values are set in ppImageSetMaskBits.c)
+    options->doCrosstalkMeasure = psMetadataLookupBool(NULL, recipe, "CROSSTALK.MEASURE");
+    options->doCrosstalkCorrect = psMetadataLookupBool(NULL, recipe, "CROSSTALK.CORRECT");
 
     options->doBias = psMetadataLookupBool(NULL, recipe, "BIAS");
@@ -214 +228 @@
         options->doStats = true;
     }
+
+    options->applyParity = psMetadataLookupBool(NULL, recipe, "APPLY.CELL.PARITY");
 
     // binned image options

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