Changeset 42371 for branches/eam_branches/ipp-20220316/psModules/src/camera/pmFPAfileIO.c

Timestamp:

Feb 4, 2023, 12:14:11 PM (3 years ago)

Author:

eugene

Message:

merge changes from trunk: new nonlinearity, new shutter time keywords, allow detections under CTE masks

Location:

branches/eam_branches/ipp-20220316/psModules

Files:

• . (modified) (1 prop)
• src/camera/pmFPAfileIO.c (modified) (4 diffs)

branches/eam_branches/ipp-20220316/psModules/src/camera/pmFPAfileIO.c

@@ -285 +285 @@
       case PM_FPA_FILE_KAPA:
       case PM_FPA_FILE_LINEARITY:
+      case PM_FPA_FILE_NEWNONLIN:
         break;
       default:
@@ -651 +652 @@
       case PM_FPA_FILE_PATTERN_DEAD_CELLS:
       case PM_FPA_FILE_LINEARITY:
+      case PM_FPA_FILE_NEWNONLIN:
       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);
@@ -736 +738 @@
       case PM_FPA_FILE_KAPA:
       case PM_FPA_FILE_LINEARITY:
+      case PM_FPA_FILE_NEWNONLIN:
         psTrace ("psModules.camera", 5, "nothing to free for %s (%s)\n", file->filename, file->name);
         return true;
@@ -896 +899 @@
       case PM_FPA_FILE_PATTERN_DEAD_CELLS:
       case PM_FPA_FILE_LINEARITY:
+      case PM_FPA_FILE_NEWNONLIN:
       case PM_FPA_FILE_EXPNUM:
         psTrace ("psModules.camera", 5, "opening %s (%s) (%d:%d:%d)\n",