FIX: Fix mgh70 montage (mne-tools#5228)

neergaard · May 23, 2018 · 4589862 · 4589862
1 parent 9ceb57d
commit 4589862
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/doc/whats_new.rst b/doc/whats_new.rst
@@ -26,6 +26,8 @@ Bug
 
 - Fix bug with ``mne flash_bem`` when ``flash30`` is not used by `Eric Larson`_
 
+- Fix bug with channel names in ``mgh70`` montage in :func:`mne.channels.read_montage` by `Eric Larson`_
+
 - Fix bug in :func:`mne.preprocessing.ICA.apply` to handle arrays as `exclude` property by `Joan Massich`_
 
 - Fix bug in ``method='eLORETA'`` for :func:`mne.minimum_norm.apply_inverse` when using a sphere model and saved ``inv`` by `Eric Larson`_

diff --git a/mne/channels/data/montages/mgh70.elc b/mne/channels/data/montages/mgh70.elc
@@ -140,13 +140,13 @@ EEG057
 EEG058
 EEG059
 EEG060
-EEG061
-EEG062
-EEG063
-EEG064
 EEG065
 EEG066
 EEG067
 EEG068
 EEG069
-EEG070
+EEG070
+EEG071
+EEG072
+EEG073
+EEG074
diff --git a/mne/channels/tests/test_montage.py b/mne/channels/tests/test_montage.py
@@ -553,6 +553,10 @@ def test_set_montage():
     assert_true((orig_pos != new_pos).all())
     r0 = _fit_sphere(new_pos)[1]
     assert_allclose(r0, [0., -0.016, 0.], atol=1e-3)
+    # mgh70 has no 61/62/63/64 (these are EOG/ECG)
+    mon = read_montage('mgh70')
+    assert 'EEG061' not in mon.ch_names
+    assert 'EEG074' in mon.ch_names
 
 
 def _check_roundtrip(montage, fname):
-Original file line number
+Diff line change
@@ Expand Up / @@ -140,13 +140,13 @@ EEG057 @@
     EEG058
     EEG059
     EEG060
-    EEG061
-    EEG062
-    EEG063
-    EEG064
     EEG065
     EEG066
     EEG067
     EEG068
     EEG069
-    EEG070
+    EEG070
+    EEG071
+    EEG072
+    EEG073
+    EEG074