Changeset 42338 for trunk/psModules/src/detrend

Timestamp:

Jan 30, 2023, 9:53:40 AM (3 years ago)

Author:

eugene

Message:

merge from branches/eam_branches/psModules.20230123: add new non-linearity correction using new psSpline

Location:

trunk/psModules

Files:

• . (modified) (1 prop)
• src/detrend/Makefile.am (modified) (2 diffs)
• src/detrend/pmDetrendDB.h (modified) (1 diff)
• src/detrend/pmNewNonLinear.c (copied) (copied from branches/eam_branches/psModules.20230123/src/detrend/pmNewNonLinear.c )
• src/detrend/pmNewNonLinear.h (copied) (copied from branches/eam_branches/psModules.20230123/src/detrend/pmNewNonLinear.h )
• src/detrend/pmOverscan.c (modified) (3 diffs)

trunk/psModules/src/detrend/Makefile.am

@@ -10 +10 @@
         pmMaskStats.c \
         pmNonLinear.c \
+        pmNewNonLinear.c \
         pmBias.c \
         pmOverscan.c \
@@ -30 +31 @@
         pmMaskStats.h \
         pmNonLinear.h \
+        pmNewNonLinear.h \
         pmBias.h \
         pmOverscan.h \

trunk/psModules/src/detrend/pmDetrendDB.h

@@ -39 +39 @@
     PM_DETREND_TYPE_VIDEODARK,
     PM_DETREND_TYPE_LINEARITY,
+    PM_DETREND_TYPE_NEWNONLIN,
     PM_DETREND_TYPE_AUXMASK,
     PM_DETREND_TYPE_KH_CORRECT,

trunk/psModules/src/detrend/pmOverscan.c

@@ -136 +136 @@
         break;
       case PM_FIT_SPLINE:
-        // XXX I don't think psSpline1D is up to scratch yet --- it has no mask, and requires an
-        // input spline
-        overscanOpts->spline = psVectorFitSpline1D(reduced, ordinate);
-        fitted = psSpline1DEvalVector(overscanOpts->spline, ordinate);
+
+        // XXX I don't think psSpline1D is up to scratch yet --- it has no mask, and it assumes
+        // a knot for every input point.  it needs an argument like 'number of knots' for the
+        // output spline.  EAM: still true 2023.01.22
+
+        // overscanOpts->spline = psVectorFitSpline1D(reduced, ordinate);
+        // fitted = psSpline1DEvalVector(overscanOpts->spline, ordinate);
+        psError(PS_ERR_UNKNOWN, true, "Spline overscan fitting is broken\n");
         break;
       default:
@@ -185 +189 @@
       }
       case PM_FIT_SPLINE: {
+        /*
           psSpline1D *spline = overscanOpts->spline; // The spline
           for (int i = 0; i < spline->n; i++) {
@@ -197 +202 @@
               comment = NULL;
           }
+        */
           // write metadata header value
           psMetadataAddF32(hdu->header, PS_LIST_TAIL, "OVER_VAL", PS_META_REPLACE,