address comments by alex

mne-tools · Dec 23, 2015 · 7b55a02 · 7b55a02
1 parent 679cff1
commit 7b55a02
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/mne/io/eeglab/eeglab.py b/mne/io/eeglab/eeglab.py
@@ -130,8 +130,8 @@ def read_raw_eeglab(input_fname, montage=None, preload=False, eog=(),
         separate binary file.
     eog : list | tuple | 'auto'
         Names or indices of channels that should be designated
-        EOG channels. If 'auto', the channel names beginning with
-        ``EOG`` are used. Defaults to empty tuple.
+        EOG channels. If 'auto', the channel names containing
+        ``EOG`` or ``EYE`` are used. Defaults to empty tuple.
     verbose : bool, str, int, or None
         If not None, override default verbose level (see mne.verbose).
 
@@ -180,8 +180,8 @@ def read_epochs_eeglab(input_fname, events=None, event_id=None, montage=None,
         :func:`mne.channels.read_montage` for more information.
     eog : list | tuple | 'auto'
         Names or indices of channels that should be designated
-        EOG channels. If 'auto', the channel names beginning with
-        ``EOG`` are used. Defaults to empty tuple.
+        EOG channels. If 'auto', the channel names containing
+        ``EOG`` or ``EYE`` are used. Defaults to empty tuple.
     verbose : bool, str, int, or None
         If not None, override default verbose level (see mne.verbose).
 
@@ -224,8 +224,8 @@ class RawEEGLAB(_BaseRaw):
         on the hard drive (slower, requires less memory).
     eog : list | tuple | 'auto'
         Names or indices of channels that should be designated
-        EOG channels. If 'auto', the channel names beginning with
-        ``EOG`` are used. Defaults to empty tuple.
+        EOG channels. If 'auto', the channel names containing
+        ``EOG`` or ``EYE`` are used. Defaults to empty tuple.
     verbose : bool, str, int, or None
         If not None, override default verbose level (see mne.verbose).
 
@@ -348,8 +348,8 @@ class EpochsEEGLAB(_BaseEpochs):
         :func:`mne.channels.read_montage` for more information.
     eog : list | tuple | 'auto'
         Names or indices of channels that should be designated
-        EOG channels. If 'auto', the channel names beginning with
-        ``EOG`` are used. Defaults to empty tuple.
+        EOG channels. If 'auto', the channel names containing
+        ``EOG`` or ``EYE`` are used. Defaults to empty tuple.
     verbose : bool, str, int, or None
         If not None, override default verbose level (see mne.verbose).
 

diff --git a/mne/io/utils.py b/mne/io/utils.py
@@ -14,11 +14,11 @@
 def _find_channels(ch_names, ch_type='EOG'):
     """Helper to find EOG channel.
     """
-    substrings = (ch_type)
+    substrings = (ch_type,)
     if ch_type == 'EOG':
         substrings = ('EOG', 'EYE')
     eog_idx = [idx for idx, ch in enumerate(ch_names) if
-               any(substring in ch for substring in substrings)]
+               any(substring in ch.upper() for substring in substrings)]
     return eog_idx