This is an automated email from the git hooks/post-receive script. yoh pushed a commit to tag 0.4 in repository python-mne.
commit 4a3696f8414d0df3425217d798b8d480feea9711 Author: Daniel Strohmeier <[email protected]> Date: Thu Jul 12 22:06:56 2012 +0200 removed duplicated code --- mne/artifacts/stim.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/mne/artifacts/stim.py b/mne/artifacts/stim.py index 9e4c2c5..9a5d876 100644 --- a/mne/artifacts/stim.py +++ b/mne/artifacts/stim.py @@ -36,23 +36,23 @@ def eliminate_stim_artifact(raw, events, event_id, tmin=-0.005, event_start = events[events_sel, 0] s_start = np.ceil(raw.info['sfreq'] * np.abs(tmin))[0] s_end = np.ceil(raw.info['sfreq'] * tmax)[0] + picks = pick_types(raw.info, meg=True, eeg=True) - if mode == 'linear': - for k in range(len(event_start)): - first_samp = event_start[k] - raw.first_samp - s_start - last_samp = event_start[k] - raw.first_samp + s_end + + if mode == 'window': + window = 1 - np.r_[signal.hann(4)[:2], np.ones(s_end + s_start - 4), \ + signal.hann(4)[-2:]].T + + for k in range(len(event_start)): + first_samp = event_start[k] - raw.first_samp - s_start + last_samp = event_start[k] - raw.first_samp + s_end + data = raw[picks, first_samp:last_samp] + if mode == 'linear': x = np.array([first_samp, last_samp]) - data = raw[picks, first_samp:last_samp] f = interpolate.interp1d(x, data[0][:, [0, -1]]) xnew = np.arange(first_samp, last_samp) interp_data = f(xnew) raw[picks, first_samp:last_samp] = interp_data - if mode == 'window': - window = 1 - np.r_[signal.hann(4)[:2], np.ones(s_end + s_start - 4), \ - signal.hann(4)[-2:]].T - for k in range(len(event_start)): - first_samp = event_start[k] - raw.first_samp - s_start - last_samp = event_start[k] - raw.first_samp + s_end - data = raw[picks, first_samp:last_samp] + elif mode == 'window': raw[picks, first_samp:last_samp] = data[0] * window[np.newaxis, :] return raw -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-mne.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
