Merge pull request #1543 from agramfort/fix_tfr_one_epoch

FIX : bug tfr_morlet on single epoch
mne-tools · Aug 30, 2014 · 5a57972 · 5a57972
2 parents 1145db4 + 0d64bb7
commit 5a57972
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/mne/time_frequency/tests/test_tfr.py b/mne/time_frequency/tests/test_tfr.py
@@ -52,6 +52,10 @@ def test_time_frequency():
     freqs = np.arange(6, 20, 5)  # define frequencies of interest
     n_cycles = freqs / 4.
 
+    # Test first with a single epoch
+    power, itc = tfr_morlet(epochs[0], freqs=freqs, n_cycles=n_cycles,
+                            use_fft=True, return_itc=True)
+
     power, itc = tfr_morlet(epochs, freqs=freqs, n_cycles=n_cycles,
                             use_fft=True, return_itc=True)
 

diff --git a/mne/time_frequency/tfr.py b/mne/time_frequency/tfr.py
@@ -407,7 +407,7 @@ def _induced_power(data, sfreq, frequencies, use_fft=True, n_cycles=7,
         plf = np.empty((n_channels, n_frequencies, n_times), dtype=np.complex)
 
         for c in range(n_channels):
-            X = np.squeeze(data[:, c, :])
+            X = data[:, c, :]
             this_psd, this_plf = _time_frequency(X, Ws, use_fft)
             psd[c], plf[c] = this_psd[:, ::decim], this_plf[:, ::decim]
     else: