Merge pull request #2010 from teonlamont/projs_topomap

larsoner · larsoner · commit 6b08e27e98a6 · 2015-04-23T10:28:24.000-07:00
MRG Projs topomap
diff --git a/mne/viz/evoked.py b/mne/viz/evoked.py
@@ -450,7 +450,7 @@ def whitened_gfp(x, rank=None):
         suptitle = ('Whitened evoked (left, best estimator = "%s")\n'
                     'and global field power '
                     '(right, comparison of estimators)' %
-                    noise_cov[0]['method'])
+                    noise_cov[0].get('method', 'empirical'))
         fig.suptitle(suptitle)
 
     ax_gfp = None
@@ -477,7 +477,7 @@ def whitened_gfp(x, rank=None):
 
     if not has_sss:
         evokeds_white[0].plot(unit=False, axes=axes_evoked,
-                              hline=[-1.96, 1.96])
+                              hline=[-1.96, 1.96], show=False)
     else:
         for ((ch_type, picks), ax) in zip(picks_list, axes_evoked):
             ax.plot(times, evokeds_white[0].data[picks].T, color='k')
@@ -492,7 +492,7 @@ def whitened_gfp(x, rank=None):
             title = '{0} ({2}{1})'.format(
                     titles_[ch] if n_columns > 1 else ch,
                     this_rank, 'rank ' if n_columns > 1 else '')
-            label = noise_cov['method']
+            label = noise_cov.get('method', 'empirical')
 
             ax_gfp[i].set_title(title if n_columns > 1 else
                                 'whitened global field power (GFP),'
diff --git a/mne/viz/topomap.py b/mne/viz/topomap.py
@@ -168,8 +168,7 @@ def plot_projs_topomap(projs, layout=None, cmap='RdBu_r', sensors=True,
     nrows = math.floor(math.sqrt(n_projs))
     ncols = math.ceil(n_projs / nrows)
 
-    fig = plt.gcf()
-    fig.clear()
+    fig = plt.figure()
     for k, proj in enumerate(projs):
 
         ch_names = _clean_names(proj['data']['col_names'])
