Skip to content

Commit

Permalink
FIX: _pick_data_channels
Browse files Browse the repository at this point in the history
  • Loading branch information
kingjr committed Mar 10, 2016
1 parent 985dc94 commit e71b5da
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions mne/time_frequency/psd.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import numpy as np

from ..parallel import parallel_func
from ..io.pick import pick_types
from ..io.pick import pick_types, _pick_data_channels
from ..utils import logger, verbose, deprecated, _time_mask
from .multitaper import _psd_multitaper

Expand Down Expand Up @@ -126,8 +126,7 @@ def _check_psd_data(inst, tmin, tmax, picks, proj):

time_mask = _time_mask(inst.times, tmin, tmax, sfreq=inst.info['sfreq'])
if picks is None:
picks = pick_types(inst.info, meg=True, eeg=True, seeg=True,
ref_meg=False, exclude='bads')
picks = _pick_data_channels(inst.info)
if proj:
# Copy first so it's not modified
inst = inst.copy().apply_proj()
Expand Down Expand Up @@ -399,8 +398,7 @@ def compute_epochs_psd(epochs, picks=None, fmin=0, fmax=np.inf, tmin=None,
n_fft = int(n_fft)
Fs = epochs.info['sfreq']
if picks is None:
picks = pick_types(epochs.info, meg=True, eeg=True, ref_meg=False,
seeg=True, exclude='bads')
picks = _pick_data_channels(epochs.info)
n_fft, n_overlap = _check_nfft(len(epochs.times), n_fft, n_overlap)

if tmin is not None or tmax is not None:
Expand Down

0 comments on commit e71b5da

Please sign in to comment.