[med-svn] [python-mne] 171/376: bug fix in pick_types

[Yaroslav Halchenko]

This is an automated email from the git hooks/post-receive script.

yoh pushed a commit to annotated tag v0.1
in repository python-mne.

commit 70c0639e8a5808a67caacd62ea400c1341fd22ff
Author: Alexandre Gramfort <alexandre.gramfort at inria.fr>
Date:   Tue Mar 29 22:15:02 2011 -0400

    bug fix in pick_types
---
 mne/fiff/pick.py | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/mne/fiff/pick.py b/mne/fiff/pick.py
index 2a045fa..31f2ef0 100644
--- a/mne/fiff/pick.py
+++ b/mne/fiff/pick.py
@@ -81,20 +81,19 @@ def pick_types(info, meg=True, eeg=False, stim=False, eog=False, ecg=False,
     info : dict
         The measurement info
     meg : bool or string
-        Is True include MEG channels or False include None
+        If True include all MEG channels. If False include None
         If string it can be 'mag' or 'grad' to select only gradiometers
         or magnetometers.
     eeg : bool
-        Is True include EEG channels
+        If True include EEG channels
     eog : bool
-        Is True include EOG channels
+        If True include EOG channels
     ecg : bool
-        Is True include ECG channels
+        If True include ECG channels
     emg : bool
-        Is True include EMG channels
+        If True include EMG channels
     stim : bool
-        Is True include stimulus channels
-
+        If True include stimulus channels
     include : list of string
         List of additional channels to include. If empty do not include any.
 
@@ -114,10 +113,10 @@ def pick_types(info, meg=True, eeg=False, stim=False, eog=False, ecg=False,
         if (kind == FIFF.FIFFV_MEG_CH or kind == FIFF.FIFFV_REF_MEG_CH):
             if meg == True:
                 pick[k] = True
-            elif (meg is 'grad'
+            elif (meg == 'grad'
                     and info['chs'][k]['unit'] == FIFF.FIFF_UNIT_T_M):
                 pick[k] = True
-            elif (meg is 'mag'
+            elif (meg == 'mag'
                     and info['chs'][k]['unit'] == FIFF.FIFF_UNIT_T):
                 pick[k] = True
         elif kind == FIFF.FIFFV_EEG_CH and eeg:

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