Changeset 42372 for branches/eam_branches/ipp-20220316/ppImage/src/ppImageParseCamera.c

Timestamp:

Feb 4, 2023, 12:15:28 PM (3 years ago)

Author:

eugene

Message:

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

Location:

branches/eam_branches/ipp-20220316/ppImage

Files:

• . (modified) (1 prop)
• src/ppImageParseCamera.c (modified) (1 diff)

branches/eam_branches/ipp-20220316/ppImage/src/ppImageParseCamera.c

@@ -104 +104 @@
 
     if (options->doNonLin) {
-      if (!ppImageDefineFile(config, input->fpa, "PPIMAGE.LINEARITY", "LINEARITY",
-                             PM_FPA_FILE_LINEARITY, PM_DETREND_TYPE_LINEARITY)) {
-        psError(PS_ERR_IO, false, "Can't find a non-linearity correction source");
-        psFree(options);
-        return NULL;
-      }
+        if (!ppImageDefineFile(config, input->fpa, "PPIMAGE.LINEARITY", "LINEARITY",
+                               PM_FPA_FILE_LINEARITY, PM_DETREND_TYPE_LINEARITY)) {
+            psError(PS_ERR_IO, false, "Can't find a non-linearity correction source");
+            psFree(options);
+            return NULL;
+        }
+    }
+    if (options->doNewNonLin) {
+        // if the file has been specified on the command-line (-newnonlin file), then the file
+        // is identified by the NEWNONLIN entry in config->arguments.  otherwise, load from the
+        // detrend system as type NEWNONLIN
+        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;
+        }
     }