Changeset 24079 for trunk/ppImage

Timestamp:

May 6, 2009, 11:01:47 AM (17 years ago)

Author:

Paul Price

Message:

Set bad dark pixels to DARK mask value.

Location:

trunk/ppImage/src

Files:

• ppImage.h (modified) (2 diffs)
• ppImageDetrendReadout.c (modified) (1 diff)
• ppImageOptions.c (modified) (1 diff)
• ppImageSetMaskBits.c (modified) (1 diff)

trunk/ppImage/src/ppImage.h

@@ -44 +44 @@
     bool checkCTE;                      // measure pixel-based variance
 
-    bool doCrosstalkMeasure;            // measure crosstalk signal
-    bool doCrosstalkCorrect;            // apply crosstalk correction
+    bool doCrosstalkMeasure;            // measure crosstalk signal
+    bool doCrosstalkCorrect;            // apply crosstalk correction
 
     // output files requested
@@ -69 +69 @@
     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
 

trunk/ppImage/src/ppImageDetrendReadout.c

@@ -68 +68 @@
 
     if (options->doDark && dark) {
-        if (!pmDarkApply(input, dark, options->flatMask)) {
+        if (!pmDarkApply(input, dark, options->darkMask)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to subtract dark.");
             psFree(detview);

trunk/ppImage/src/ppImageOptions.c

@@ -58 +58 @@
     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

trunk/ppImage/src/ppImageSetMaskBits.c

@@ -14 +14 @@
     // at this point we know we have valid values for required entries SAT, BAD, FLAT, BLANK:
 
-    // mask for non-linear flat corrections
+    // mask for bad flat corrections
     options->flatMask = pmConfigMaskGet("FLAT", config);
     psAssert (options->flatMask, "flat mask not set");
+
+    // mask for bad dark corrections
+    options->darkMask = pmConfigMaskGet("DARK", config);
+    psAssert (options->darkMask, "dark mask not set");
 
     // mask for non-existent data  (default to DETECTOR if not defined)