Changeset 42331

Timestamp:

Jan 30, 2023, 9:43:21 AM (3 years ago)

Author:

eugene

Message:

adding code to support the new (2023.01.30) non-linearity analysis based on new models determined by Hua Gao

Location:

branches/eam_branches/ppImage.20230123/src

Files:

• Makefile.am (modified) (1 diff)
• ppImage.h (modified) (2 diffs)
• ppImageDetrendNewNonLinear.c (modified) (2 diffs)

branches/eam_branches/ppImage.20230123/src/Makefile.am

@@ -23 +23 @@
         ppImageDetrendRecord.c \
         ppImageDetrendNonLinear.c \
+        ppImageDetrendNewNonLinear.c \
         ppImageDetrendFringe.c \
         ppImageDetrendFree.c \

branches/eam_branches/ppImage.20230123/src/ppImage.h

@@ -35 +35 @@
     bool doAuxMask;                     // apply auxillary mask
     bool doNonLin;                      // Non-linearity correction
+    bool doNewNonLin;                   // Non-linearity correction
     bool doOverscan;                    // Overscan subtraction
     bool doNoiseMap;                    // Bias subtraction
@@ -175 +176 @@
 bool ppImageDetrendBias(pmReadout *inputReadout, pmReadout *bias, pmReadout *dark, ppImageOptions *options);
 
+bool ppImageDetrendNewNonLinear(pmReadout *input, pmFPAview *linearity, pmConfig *config);
+
 bool ppImageDetrendNonLinear(pmReadout *input, pmFPAview *linearity, pmConfig *config);
 bool ppImageDetrendNonLinearLookup(pmReadout *input, psMetadataItem *dataItem);

branches/eam_branches/ppImage.20230123/src/ppImageDetrendNewNonLinear.c

@@ -5 +5 @@
     bool status;
 
-    pmFPAfile *linearity_file = psMetadataLookupPtr(&status, config->files, "PPIMAGE.LINEARITY");
+    pmFPAfile *linearity_file = psMetadataLookupPtr(&status, config->files, "PPIMAGE.NEWNONLIN");
     psFits *linearity_fits = linearity_file->fits;
 
@@ -16 +16 @@
     // if pmFPAfile has been loaded (by ppImageDefineFile in ppImageParseCamera), then
     // the file corresponding to the current chip is found and opened
+    // NOTE: if the extname is missing, we skip the correction
     if (!psFitsMoveExtName(linearity_fits, extname)) {
-        psError(PS_ERR_IO, false, "Unable to move to non-linearity (v2023) table %s", extname);
-        return(false);
+        psLogMsg ("ppImageDetrendNewNonLinear", 4, "Unable to move to non-linearity (v2023) table %s, skipping", extname);
+        return(true);
     }