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 7a2b200dd6fc7f3b9ac3163a80c50568467ca70a Author: Alexandre Gramfort <[email protected]> Date: Sun Jun 17 15:59:54 2012 +0300 FIX : fix Epochs with reject=None and epoch at the end of file --- mne/epochs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mne/epochs.py b/mne/epochs.py index 5be55e1..1013d40 100644 --- a/mne/epochs.py +++ b/mne/epochs.py @@ -298,10 +298,10 @@ class Epochs(object): if data is None: return False n_times = len(self.times) + if data.shape[1] < n_times: + return False # epoch is too short ie at the end of the data if self.reject is None and self.flat is None: return True - elif data.shape[1] < n_times: - return False # epoch is too short ie at the end of the data else: return _is_good(data, self.ch_names, self._channel_type_idx, self.reject, self.flat) -- 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
