tweak times related inputs to plot_combined

neurodsp/plts/combined.py

@@ -11,8 +11,9 @@
 ###################################################################################################
 
 @savefig
-def plot_timeseries_and_spectrum(sig, fs, ts_range=None, f_range=None, spectrum_kwargs=None,
-                                 start_val=0., ts_kwargs=None, psd_kwargs=None, **plt_kwargs):
+def plot_timeseries_and_spectrum(sig, fs, ts_range=None, f_range=None, times=None, start_val=0.,
+                                 spectrum_kwargs=None, ts_kwargs=None, psd_kwargs=None,
+                                 **plt_kwargs):
     """Plot a timeseries together with it's associated power spectrum.
 
     Parameters
@@ -26,12 +27,15 @@ def plot_timeseries_and_spectrum(sig, fs, ts_range=None, f_range=None, spectrum_
         For visualization only - the power spectrum is computed over the entire time series.
     f_range : list of [float, float], optional
         The frequency range to restrict the power spectrum to.
+    times : 1d, optional
+        Time definition for the time series to be plotted.
+        If not provided, times are recomputed from signal length and sampling rate.
+    start_val : float, optional, default: 0.
+        The starting value for the time definition for the time series.
+        Only used if `times` is not provided.
     spectrum_kwargs : dict, optional
         Keyword arguments for computing the power spectrum.
         See `compute_spectrum` for details.
-    start_val : float, optional
-        The starting value for the time definition for the time series.
-        If not provided, defaults to zero.
     ts_kwargs : dict, optional
         Keyword arguments for customizing the time series plot.
     psd_kwargs : dict, optional
@@ -59,9 +63,10 @@ def plot_timeseries_and_spectrum(sig, fs, ts_range=None, f_range=None, spectrum_
     ax1 = fig.add_axes([0.0, 0.6, 1.3, 0.5])
     ax2 = fig.add_axes([1.5, 0.6, 0.6, 0.5])
 
+    if not times:
+        times = create_times(len(sig) / fs, fs, start_val=start_val)
     if ts_range:
         ts_kwargs['xlim'] = ts_range
-    times = create_times(len(sig) / fs, fs, start_val=start_val)
     plot_time_series(times, sig, ax=ax1, **plt_kwargs,
                      **ts_kwargs if ts_kwargs else {})