Changeset 43038 for trunk/ppImage

Timestamp:

May 28, 2026, 9:38:40 PM (7 weeks ago)

Author:

eugene

Message:

add code to mask bad cells based on their overscan values compared with a reference table

Location:

trunk/ppImage/src

Files:

• Makefile.am (modified) (1 diff)
• ppImage.h (modified) (2 diffs)
• ppImageArguments.c (modified) (2 diffs)
• ppImageDetrendFree.c (modified) (1 diff)
• ppImageDetrendReadout.c (modified) (1 diff)
• ppImageDetrendRecord.c (modified) (1 diff)
• ppImageMaskBadOverscan.c (added)
• ppImageOptions.c (modified) (2 diffs)
• ppImageParseCamera.c (modified) (1 diff)

trunk/ppImage/src/Makefile.am

@@ -33 +33 @@
         ppImageMosaicBackground.c \
         ppImageMaskStats.c \
+        ppImageMaskBadOverscan.c \
         ppImagePhotom.c \
         ppImageAstrom.c \

trunk/ppImage/src/ppImage.h

@@ -36 +36 @@
     bool doNonLin;                      // Non-linearity correction
     bool doNewNonLin;                   // Non-linearity correction
+    bool doMaskBadOverscan;             // Mask cells/readouts with out-of-range overscan 
     bool doOverscan;                    // Overscan subtraction
     bool doNoiseMap;                    // Bias subtraction
@@ -180 +181 @@
 bool ppImageDetrendBias(pmReadout *inputReadout, pmReadout *bias, pmReadout *dark, ppImageOptions *options);
 
+bool ppImageMaskBadOverscan(pmReadout *input, pmConfig  *config);
+
 bool ppImageDetrendNewNonLinear(pmReadout *input, pmFPAview *linearity, pmConfig *config);
 

trunk/ppImage/src/ppImageArguments.c

@@ -26 +26 @@
     fprintf(stderr, "\t-linearity/-linearlist: linearity correction file.\n");
     fprintf(stderr, "\t-newnonlin/-newnonlinlist: non-linearity correction file (v 2023.01).\n");
+    fprintf(stderr, "\t-valid-overscan/-valid-overscan-list: overscan valid range file.\n");
     fprintf(stderr, "\n");
     exit (2);
@@ -118 +119 @@
     pmConfigFileSetsMD (config->arguments, &argc, argv, "LINEARITY", "-linearity", "-linearlist");
     pmConfigFileSetsMD (config->arguments, &argc, argv, "NEWNONLIN", "-newnonlin", "-newnonlinlist");
+    pmConfigFileSetsMD (config->arguments, &argc, argv, "VALID.OVERSCAN", "-valid-overscan", "-valid-overscan-list");
     pmConfigFileSetsMD (config->arguments, &argc, argv, "PATTERN.ROW.AMP", "-pattern-row-amplitude", "-not-defined");
     pmConfigFileSetsMD (config->arguments, &argc, argv, "PATTERN.DEAD.CELLS", "-pattern-dead-cells", "-not-defined");

trunk/ppImage/src/ppImageDetrendFree.c

@@ -15 +15 @@
     "PPIMAGE.LINEARITY",
     "PPIMAGE.NEWNONLIN",
+    "PPIMAGE.VALID.OVERSCAN",
     NULL
 };

trunk/ppImage/src/ppImageDetrendReadout.c

@@ -167 +167 @@
     }
 
+    // Mask bad cells based on the overscan values
+    if (options->doMaskBadOverscan) {
+      if (!ppImageMaskBadOverscan(input, config)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to mask readout based on overscan");
+        psFree(detview);
+        return(false);
+      }
+    }
+
     // measure the overscan-subtracted readoutBackground here (or subtract the overscan value?)
     // XXX this is the measurements and should be independent of the pattern masking

trunk/ppImage/src/ppImageDetrendRecord.c

@@ -75 +75 @@
     detrendRecord(options->doFringe,   detrend, config, view, "PPIMAGE.FRINGE",   "DETREND.FRINGE",   "Fringe filename");
 
-    detrendRecord(options->doNonLin,    detrend, config, view, "PPIMAGE.LINEARITY","DETREND.NONLIN",   "Non-linearity table filename");
-    detrendRecord(options->doNewNonLin, detrend, config, view, "PPIMAGE.NEWNONLIN","DETREND.NEWNONLIN","Non-linearity table filename (v2023)");
+    detrendRecord(options->doNonLin,          detrend, config, view, "PPIMAGE.LINEARITY",      "DETREND.NONLIN",         "Non-linearity table filename");
+    detrendRecord(options->doNewNonLin,       detrend, config, view, "PPIMAGE.NEWNONLIN",      "DETREND.NEWNONLIN",      "Non-linearity table filename (v2023)");
+    detrendRecord(options->doMaskBadOverscan, detrend, config, view, "PPIMAGE.VALID.OVERSCAN", "DETREND.VALID.OVERSCAN", "Valid Overscan table filename");
 
     detrendRecord(options->doDark & options->useVideoDark, detrend, config, view, "PPIMAGE.VIDEODARK", "DETREND.VIDEODARK", "VideoDark filename");

trunk/ppImage/src/ppImageOptions.c

@@ -29 +29 @@
     options->doNonLin        = false;   // Non-linearity correction
     options->doNewNonLin     = false;   // New Non-linearity correction (v2023)
+    options->doMaskBadOverscan = false; // Mask cells / readouts if overscan is out of bounds
     options->doOverscan      = false;   // Overscan subtraction
     options->doNoiseMap      = false;   // Apply Read Noise Map
@@ -182 +183 @@
     }
 
+    // Mask cells/readouts with out-of-range overscan 
+    // nominal overscan ranges are loaded from a file defined in the detrend system or on the command-line
+    if (psMetadataLookupBool(NULL, recipe, "MASK.BAD.OVERSCAN")) {
+        options->doMaskBadOverscan = true;
+    }
+
     // XXX PAP: The overscan stuff needs to be updated following the reworked API
 

trunk/ppImage/src/ppImageParseCamera.c

@@ -117 +117 @@
         if (!ppImageDefineFile(config, input->fpa, "PPIMAGE.NEWNONLIN", "NEWNONLIN",
                                PM_FPA_FILE_NEWNONLIN, PM_DETREND_TYPE_NEWNONLIN)) {
+            psError(PS_ERR_IO, false, "Can't find a new non-linearity correction source");
+            psFree(options);
+            return NULL;
+        }
+    }
+    if (options->doMaskBadOverscan) {
+        // if the file has been specified on the command-line (-valid-overscan file), then the file
+        // is identified by the VALID.OVERSCAN entry in config->arguments.  otherwise, load from the
+        // detrend system as type VALID.OVERSCAN
+        if (!ppImageDefineFile(config, input->fpa, "PPIMAGE.VALID.OVERSCAN", "VALID.OVERSCAN",
+                               PM_FPA_FILE_VALID_OVERSCAN, PM_DETREND_TYPE_VALID_OVERSCAN)) {
             psError(PS_ERR_IO, false, "Can't find a new non-linearity correction source");
             psFree(options);