[med-svn] [python-mne] 252/353: FIX Epochs.average(): use correct n_events when preload==False

[Yaroslav Halchenko]

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 52fb2f0660484aeabc888826f0bc9fe5a1d59c6a
Author: christianmbrodbeck <christianmbrodbeck at gmail.com>
Date:   Tue Jul 10 23:06:03 2012 -0400

    FIX Epochs.average(): use correct n_events when preload==False
---
 mne/epochs.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mne/epochs.py b/mne/epochs.py
index 00e247f..51a33f8 100644
--- a/mne/epochs.py
+++ b/mne/epochs.py
@@ -408,13 +408,15 @@ class Epochs(object):
         evoked.info = copy.deepcopy(self.info)
         n_channels = len(self.ch_names)
         n_times = len(self.times)
-        n_events = len(self.events)
         if self.preload:
+            n_events = len(self.events)
             data = np.mean(self._data, axis=0)
         else:
             data = np.zeros((n_channels, n_times))
+            n_events = 0
             for e in self:
                 data += e
+                n_events += 1
             data /= n_events
         evoked.data = data
         evoked.times = self.times.copy()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-mne.git