Changeset 42371 for branches/eam_branches/ipp-20220316/psModules/src/detrend/pmOverscan.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/detrend/pmOverscan.c (modified) (3 diffs)

branches/eam_branches/ipp-20220316/psModules/src/detrend/pmOverscan.c

@@ -140 +140 @@
         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:
@@ -189 +193 @@
       }
       case PM_FIT_SPLINE: {
+        /*
           psSpline1D *spline = overscanOpts->spline; // The spline
           for (int i = 0; i < spline->n; i++) {
@@ -201 +206 @@
               comment = NULL;
           }
+        */
           // write metadata header value
           psMetadataAddF32(hdu->header, PS_LIST_TAIL, "OVER_VAL", PS_META_REPLACE,