diff --git a/python/lsst/cp/pipe/deferredCharge.py b/python/lsst/cp/pipe/deferredCharge.py index b7552af3..da5efa53 100644 --- a/python/lsst/cp/pipe/deferredCharge.py +++ b/python/lsst/cp/pipe/deferredCharge.py @@ -594,6 +594,8 @@ def findTraps(self, inputMeasurements, calib, detector): # Create spline model for the trap, using the residual # between data and model as a function of the last image # column mean (new_signal) scaled by (1 - A_L). + # Note that this ``spline`` model is actually a piecewise + # linear interpolation and not a true spline. new_signal = np.asarray((1 - calib.driftScale[ampName])*new_signal, dtype=np.float64) x = new_signal y = np.maximum(0, res) @@ -602,10 +604,6 @@ def findTraps(self, inputMeasurements, calib, detector): y = np.pad(y, (10, 0), 'linear_ramp', end_values=(0, 0)) x = np.pad(x, (10, 0), 'linear_ramp', end_values=(0, 0)) - # Pad right with constant - y = np.pad(y, (1, 1), 'constant', constant_values=(0, y[-1])) - x = np.pad(x, (1, 1), 'constant', constant_values=(-1, 200000.)) - trap = SerialTrap(20000.0, 0.4, 1, 'spline', np.concatenate((x, y)).tolist()) calib.serialTraps[ampName] = trap