Merge pull request #1094 from agramfort/misc

MISC : use + not - with combining conditions in epochs
mne-tools · Jan 23, 2014 · d721b46 · d721b46
2 parents 36f9d60 + d6f809f
commit d721b46
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/mne/epochs.py b/mne/epochs.py
@@ -1127,8 +1127,8 @@ def __getitem__(self, key):
         if isinstance(key, list) and isinstance(key[0], string_types):
             select = np.any(np.atleast_2d([epochs._key_match(k)
                                            for k in key]), axis=0)
-            epochs.name = ('-'.join(key) if epochs.name == 'Unknown'
-                           else 'epochs_%s' % '-'.join(key))
+            epochs.name = ('+'.join(key) if epochs.name == 'Unknown'
+                           else 'epochs_%s' % '+'.join(key))
         else:
             select = key if isinstance(key, slice) else np.atleast_1d(key)