Changeset 43049 for trunk/psModules

Timestamp:

Jun 5, 2026, 10:55:58 AM (6 weeks ago)

Author:

eugene

Message:

use consistent names (VALID_OVERSCAN) for detrend type; fix a couple minor bugs in bad-overscan masking; use jpeg rules matching default chip

Location:

trunk/psModules/src

Files:

• camera/pmFPAfile.c (modified) (1 diff)
• detrend/pmDetrendDB.c (modified) (1 diff)
• detrend/pmMaskBadOverscan.c (modified) (1 diff)

trunk/psModules/src/camera/pmFPAfile.c

@@ -543 +543 @@
       return PM_FPA_FILE_NEWNONLIN;
     }
-    if (!strcasecmp(type, "VALID.OVERSCAN"))  {
+    if (!strcasecmp(type, "VALID_OVERSCAN"))  {
       return PM_FPA_FILE_VALID_OVERSCAN;
     }

trunk/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);

trunk/psModules/src/detrend/pmMaskBadOverscan.c

@@ -32 +32 @@
 
     // completely mask the readout
-    for (int i = 0; i < mask->numRows; i++) { // Loop over rows : note: problem with discontinuity here
-        for (int j = 0; j < mask->numCols; j++) { // Loop over columns
-          mask->data.PS_TYPE_IMAGE_MASK_DATA[j][i] |= maskValue;
+    for (int iy = 0; iy < mask->numRows; iy++) { // Loop over rows : note: problem with discontinuity here
+        for (int ix = 0; ix < mask->numCols; ix++) { // Loop over columns
+          mask->data.PS_TYPE_IMAGE_MASK_DATA[iy][ix] |= maskValue;
         }
     }