This is an automated email from the git hooks/post-receive script. yoh pushed a commit to annotated tag v0.2 in repository python-mne.
commit 361b2eb0b541bed04b15cd6eecfb96d75719b1eb Merge: 51a953b 382c164 Author: Martin Luessi <[email protected]> Date: Wed Sep 28 16:25:14 2011 -0400 Merge branch 'master' into epoch_indexing Conflicts: mne/epochs.py mne/epochs.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --cc mne/epochs.py index 201f570,778d9c7..a12ea38 --- a/mne/epochs.py +++ b/mne/epochs.py @@@ -273,24 -231,20 +273,22 @@@ class Epochs(object) """ n_channels = len(self.ch_names) n_times = len(self.times) - n_events = len(self) - data = np.empty((n_events, n_channels, n_times)) - cnt = 0 + n_events = len(self.events) + data = list() n_reject = 0 - event_idx = [] ++ event_idx = list() for k in range(n_events): - e = self._get_epoch_from_disk(k) - if self._is_good_epoch(e): - data.append(self._get_epoch_from_disk(k)) + epoch = self._get_epoch_from_disk(k) + if self._is_good_epoch(epoch): - data[cnt] = epoch ++ data.append(epoch) + event_idx.append(k) - cnt += 1 else: n_reject += 1 print "Rejecting %d epochs." % n_reject - return data[:cnt], event_idx - return np.array(data) ++ return np.array(data), event_idx def _is_good_epoch(self, data): - """Determine is epoch is good + """Determine if epoch is good """ n_times = len(self.times) if self.reject is None and self.flat is None: -- 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
