diff --git a/neurodsp/sim/params.py b/neurodsp/sim/params.py index 9c955ee7..c46ebcfc 100644 --- a/neurodsp/sim/params.py +++ b/neurodsp/sim/params.py @@ -253,7 +253,7 @@ def _make_params(self, parameters=None, **kwargs): params = {**parameters, **kwargs} # If any base parameters were passed in, clear them - for bparam in self.base.keys(): + for bparam in self.base: params.pop(bparam, None) return params diff --git a/neurodsp/sim/update.py b/neurodsp/sim/update.py index 5dd47199..c75db627 100644 --- a/neurodsp/sim/update.py +++ b/neurodsp/sim/update.py @@ -246,7 +246,7 @@ def param_sample_yielder(sim_params, samplers, n_samples=None): Simulation parameter definition. """ - for ind in counter(n_samples): + for _ in counter(n_samples): out_params = deepcopy(sim_params) for updater, sampler in samplers.items(): updater(out_params, next(sampler)) diff --git a/neurodsp/spectral/__init__.py b/neurodsp/spectral/__init__.py index ef81e7cb..050c103a 100644 --- a/neurodsp/spectral/__init__.py +++ b/neurodsp/spectral/__init__.py @@ -1,6 +1,6 @@ """Spectral module, for calculating power spectra, spectral variance, etc.""" -from .power import (compute_spectrum, compute_spectrum_welch, compute_spectrum_wavelet, +from .power import (compute_spectrum, compute_spectrum_welch, compute_spectrum_wavelet, compute_spectrum_medfilt, compute_spectrum_multitaper) from .measures import compute_absolute_power, compute_relative_power, compute_band_ratio from .variance import compute_scv, compute_scv_rs, compute_spectral_hist