rdrecord: handle smooth_frames when maximum spf is 1.

rdrecord can return signal data in any of four formats:

- by resampling all signals to a uniform rate ("smoothing"), and
  setting d_signal to a two-dimensional array, where d_signal[t,s] is
  sample t of signal s

- by resampling to a uniform rate, and setting p_signal to a
  two-dimensional array, where p_signal[t,s] is sample t of signal s
  converted into physical units

- by setting e_d_signal to a list of one-dimensional arrays, where
  e_d_signal[s][t] is sample t of signal s

- by setting e_p_signal to a list of one-dimensional arrays, where
  e_p_signal[s][t] is sample t of signal s converted into physical
  units

If the selected signals contain multiple samples per frame, the
behavior of rdrecord is consistent:

- If smooth_frames is True, the selected signals are resampled to the
  frame rate and stored as d_signal or p_signal.

- If smooth_frames is False, the selected signals are stored in their
  original form as e_d_signal or e_p_signal.

However, if each of the selected signals contains only one sample per
frame, rdrecord would previously behave inconsistently:

- If all signals in the record contain only one sample per frame, and
  smooth_frames is False and physical is True, the selected signals
  would be stored as p_signal (not e_p_signal as the caller would
  expect.)

- If all signals in the record contain only one sample per frame, and
  smooth_frames is False and physical is False, rdrecord would crash
  with a TypeError in convert_dtype.

- If some signals in the record contain multiple samples per frame
  (but the selected signals don't), rdrecord would crash with an
  AttributeError in _arrange_fields.

Change this behavior so that if smooth_frames is false, rdrecord will
always store the signals as e_d_signal or e_p_signal, regardless of
the underlying number of samples per frame.

Author: Benjamin Moody

wfdb/io/record.py

@@ -3363,10 +3363,9 @@ def rdrecord(record_name, sampfrom=0, sampto=None, channels=None,
         directly return a WFDB MultiRecord object (False), or to convert
         it into and return a WFDB Record object (True).
     smooth_frames : bool, optional
-        Used when reading records with signals having multiple samples
-        per frame. Specifies whether to smooth the samples in signals
-        with more than one sample per frame and return an (MxN) uniform
-        numpy array as the `d_signal` or `p_signal` field (True), or to
+        Specifies whether to smooth the samples in signals with more
+        than one sample per frame and return an (MxN) uniform numpy
+        array as the `d_signal` or `p_signal` field (True), or to
         return a list of 1d numpy arrays containing every expanded
         sample as the `e_d_signal` or `e_p_signal` field (False).
     ignore_skew : bool, optional
@@ -3535,7 +3534,7 @@ def rdrecord(record_name, sampfrom=0, sampto=None, channels=None,
             return_res=return_res)
 
         # Only 1 sample/frame, or frames are smoothed. Return uniform numpy array
-        if smooth_frames or max([record.samps_per_frame[c] for c in channels]) == 1:
+        if smooth_frames:
             # Read signals from the associated dat files that contain
             # wanted channels
             record.d_signal = signals