Changeset 23845

Timestamp:

Apr 13, 2009, 5:19:15 PM (17 years ago)

Author:

eugene

Message:

adding option to measure the crosstalk (GPC1-specific for now)

Location:

trunk/ppImage/src

Files:

• Makefile.am (modified) (1 diff)
• ppImage.h (modified) (2 diffs)
• ppImageCorrectCrosstalk.c (added)
• ppImageLoop.c (modified) (1 diff)
• ppImageMeasureCrosstalk.c (added)
• ppImageOptions.c (modified) (2 diffs)

trunk/ppImage/src/Makefile.am

@@ -50 +50 @@
         ppImageMetadataStats.c \
         ppImageReplaceBackground.c \
+        ppImageMeasureCrosstalk.c \
+        ppImageCorrectCrosstalk.c \
         ppImageDefineFile.c \
         ppImageSetMaskBits.c \

trunk/ppImage/src/ppImage.h

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

trunk/ppImage/src/ppImageLoop.c

@@ -50 +50 @@
             ESCAPE("load failure for Chip");
         }
+
+        // crosstalk measurement needs to be done on the entire chip at once, and before
+        // signal levels are modified by the detrending.  If crosstalk measurement is
+        // requested, the read-level for the images is set to CHIP.
+        if (!ppImageMeasureCrosstalk(config, options, view)) {
+          ESCAPE("Unable to perform crosstalk correction");
+        }
+
+        // crosstalk correction needs to be done on the entire chip at once, and before
+        // signal levels are modified by the detrending.  If crosstalk correction is
+        // requested, the read-level for the images is set to CHIP.
+        if (!ppImageCorrectCrosstalk(config, options, view)) {
+          ESCAPE("Unable to perform crosstalk correction");
+        }
 
         psTimerStart(TIMER_DETREND);

trunk/ppImage/src/ppImageOptions.c

@@ -61 +61 @@
     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
     options->nonLinearType   = 0;       // Type of non-linearity data (vector, string or metadata)
@@ -207 +211 @@
     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");
     options->doDark = psMetadataLookupBool(NULL, recipe, "DARK");