This is an automated email from the git hooks/post-receive script. yoh pushed a commit to tag 0.4 in repository python-mne.
commit fc2dd0e625783c836b031e90ade6e0afd2518ebd Author: Alexandre Gramfort <[email protected]> Date: Sat Jul 28 12:17:29 2012 +0200 pep8 --- mne/minimum_norm/tests/test_time_frequency.py | 11 ++++++----- mne/minimum_norm/time_frequency.py | 8 ++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/mne/minimum_norm/tests/test_time_frequency.py b/mne/minimum_norm/tests/test_time_frequency.py index 08a71ca..8b5353b 100644 --- a/mne/minimum_norm/tests/test_time_frequency.py +++ b/mne/minimum_norm/tests/test_time_frequency.py @@ -84,11 +84,12 @@ def test_source_psd(): tmin, tmax = 0, 20 # seconds fmin, fmax = 55, 65 # Hz NFFT = 2048 - stc = compute_source_psd(raw, inverse_operator, lambda2=1. / 9., method="dSPM", - tmin=tmin, tmax=tmax, fmin=fmin, fmax=fmax, - pick_normal=True, NFFT=NFFT, label=label, overlap=0.1) + stc = compute_source_psd(raw, inverse_operator, lambda2=1. / 9., + method="dSPM", tmin=tmin, tmax=tmax, + fmin=fmin, fmax=fmax, pick_normal=True, + NFFT=NFFT, label=label, overlap=0.1) assert_true(stc.times[0] >= fmin * 1e-3) assert_true(stc.times[-1] <= fmax * 1e-3) # Time max at line frequency (60 Hz in US) - assert_true(59e-3 <= stc.times[np.argmax(np.sum(stc.data, axis=0))] <= 61e-3) - \ No newline at end of file + assert_true(59e-3 <= stc.times[np.argmax(np.sum(stc.data, axis=0))] + <= 61e-3) diff --git a/mne/minimum_norm/time_frequency.py b/mne/minimum_norm/time_frequency.py index 5264abf..11c8897 100644 --- a/mne/minimum_norm/time_frequency.py +++ b/mne/minimum_norm/time_frequency.py @@ -14,8 +14,8 @@ from ..parallel import parallel_func def source_band_induced_power(epochs, inverse_operator, bands, label=None, - lambda2=1.0 / 9.0, method="dSPM", n_cycles=5, df=1, - use_fft=False, decim=1, baseline=None, + lambda2=1.0 / 9.0, method="dSPM", n_cycles=5, + df=1, use_fft=False, decim=1, baseline=None, baseline_mode='logratio', pca=True, n_jobs=1, dSPM=None): """Compute source space induced power in given frequency bands @@ -164,8 +164,8 @@ def _compute_pow_plv(data, K, sel, Ws, source_ori, use_fft, Vh, with_plv, def _source_induced_power(epochs, inverse_operator, frequencies, label=None, - lambda2=1.0 / 9.0, method="dSPM", n_cycles=5, decim=1, - use_fft=False, pca=True, pick_normal=True, + lambda2=1.0 / 9.0, method="dSPM", n_cycles=5, + decim=1, use_fft=False, pca=True, pick_normal=True, n_jobs=1, with_plv=True, zero_mean=False): """Aux function for source_induced_power """ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-mne.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
