Changeset 43127

Timestamp:

Oct 15, 2026, 5:22:02 PM (40 hours ago)

Author:

eugene

Message:

merge changes from trunk: masking bad overscans

Location:

branches/eam_branches/ipp-pstamp-20260421/psModules

Files:

• . (modified) (1 prop)
• src/camera/pmFPAfile.c (modified) (1 diff)
• src/camera/pmFPAfile.h (modified) (1 diff)
• src/camera/pmFPAfileIO.c (modified) (4 diffs)
• src/detrend/Makefile.am (modified) (2 diffs)
• src/detrend/pmDetrendDB.c (modified) (1 diff)
• src/detrend/pmDetrendDB.h (modified) (1 diff)
• src/detrend/pmMaskBadOverscan.c (copied) (copied from trunk/psModules/src/detrend/pmMaskBadOverscan.c )
• src/detrend/pmMaskBadOverscan.h (copied) (copied from trunk/psModules/src/detrend/pmMaskBadOverscan.h )
• src/detrend/pmPattern.c (modified) (1 diff)
• src/psmodules.h (modified) (1 diff)

branches/eam_branches/ipp-pstamp-20260421/psModules/src/camera/pmFPAfile.c

@@ -542 +542 @@
     if (!strcasecmp(type, "NEWNONLIN"))  {
       return PM_FPA_FILE_NEWNONLIN;
+    }
+    if (!strcasecmp(type, "VALID_OVERSCAN"))  {
+      return PM_FPA_FILE_VALID_OVERSCAN;
     }
     if (!strcasecmp(type, "ASTROM"))     {

branches/eam_branches/ipp-pstamp-20260421/psModules/src/camera/pmFPAfile.h

@@ -56 +56 @@
     PM_FPA_FILE_LINEARITY,
     PM_FPA_FILE_NEWNONLIN,
+    PM_FPA_FILE_VALID_OVERSCAN,
     PM_FPA_FILE_EXPNUM,
 } pmFPAfileType;

branches/eam_branches/ipp-pstamp-20260421/psModules/src/camera/pmFPAfileIO.c

@@ -286 +286 @@
       case PM_FPA_FILE_LINEARITY:
       case PM_FPA_FILE_NEWNONLIN:
+      case PM_FPA_FILE_VALID_OVERSCAN:
         break;
       default:
@@ -653 +654 @@
       case PM_FPA_FILE_LINEARITY:
       case PM_FPA_FILE_NEWNONLIN:
+      case PM_FPA_FILE_VALID_OVERSCAN:
       case PM_FPA_FILE_EXPNUM:
         psTrace ("psModules.camera", 5, "closing %s (%s) (%d:%d:%d)\n", file->filename, file->name, view->chip, view->cell, view->readout);
@@ -739 +741 @@
       case PM_FPA_FILE_LINEARITY:
       case PM_FPA_FILE_NEWNONLIN:
+      case PM_FPA_FILE_VALID_OVERSCAN:
         psTrace ("psModules.camera", 5, "nothing to free for %s (%s)\n", file->filename, file->name);
         return true;
@@ -900 +903 @@
       case PM_FPA_FILE_LINEARITY:
       case PM_FPA_FILE_NEWNONLIN:
+      case PM_FPA_FILE_VALID_OVERSCAN:
       case PM_FPA_FILE_EXPNUM:
         psTrace ("psModules.camera", 5, "opening %s (%s) (%d:%d:%d)\n",

branches/eam_branches/ipp-pstamp-20260421/psModules/src/detrend/Makefile.am

@@ -11 +11 @@
         pmNonLinear.c \
         pmNewNonLinear.c \
+        pmMaskBadOverscan.c \
         pmBias.c \
         pmOverscan.c \
@@ -32 +33 @@
         pmNonLinear.h \
         pmNewNonLinear.h \
+        pmMaskBadOverscan.h \
         pmBias.h \
         pmOverscan.h \

branches/eam_branches/ipp-pstamp-20260421/psModules/src/detrend/pmDetrendDB.c

@@ -113 +113 @@
         DETREND_STRING_CASE(AUXMASK);
         DETREND_STRING_CASE(KH_CORRECT);
+        DETREND_STRING_CASE(VALID_OVERSCAN);
         DETREND_STRING_CASE(PATTERN_ROW_AMP);
         DETREND_STRING_CASE(PATTERN_DEAD_CELLS);

branches/eam_branches/ipp-pstamp-20260421/psModules/src/detrend/pmDetrendDB.h

@@ -44 +44 @@
     PM_DETREND_TYPE_PATTERN_ROW_AMP,
     PM_DETREND_TYPE_PATTERN_DEAD_CELLS,
+    PM_DETREND_TYPE_VALID_OVERSCAN,
 } pmDetrendType;
 

branches/eam_branches/ipp-pstamp-20260421/psModules/src/detrend/pmPattern.c

@@ -1217 +1217 @@
     // Count number of cells to tweak
     int numTweak = 0;                   // Number of cells to tweak
-    int numIgnore = 0;                  // Number of cells to ignore
     for (int i = 0; i < numCells; i++) {
         pmCell *cell = chip->cells->data[i]; // Cell of interest
         if (!cell || !cell->data_exists || !cell->process ||
             cell->readouts->n == 0 || cell->readouts->n > 1 || !cell->readouts->data[0]) {
-            numIgnore++;
             meanMask->data.PS_TYPE_VECTOR_MASK_DATA[i] = PM_PATTERN_IGNORE;
             continue;

branches/eam_branches/ipp-pstamp-20260421/psModules/src/psmodules.h

@@ -75 +75 @@
 #include <pmFringeStats.h>
 #include <pmMaskBadPixels.h>
+#include <pmMaskBadOverscan.h>
 #include <pmMaskStats.h>
 #include <pmNonLinear.h>