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 b9c5690073b988e0121322aceb6cbc0382e7ab0b Author: Alexandre Gramfort <[email protected]> Date: Wed Jul 18 13:48:46 2012 +0200 ENH : factorize _prepare_inverse function --- mne/minimum_norm/inverse.py | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/mne/minimum_norm/inverse.py b/mne/minimum_norm/inverse.py index 0f9ca8e..7b742ca 100644 --- a/mne/minimum_norm/inverse.py +++ b/mne/minimum_norm/inverse.py @@ -1042,33 +1042,8 @@ def make_inverse_operator(info, forward, noise_cov, loose=0.2, depth=0.8): if depth is not None and not (0 < depth <= 1): raise ValueError('depth should be a scalar between 0 and 1') - fwd_ch_names = [c['ch_name'] for c in forward['info']['chs']] - ch_names = [c['ch_name'] for c in info['chs'] - if (c['ch_name'] not in info['bads']) - and (c['ch_name'] in fwd_ch_names)] - n_chan = len(ch_names) - - print "Computing inverse operator with %d channels." % n_chan - - noise_cov = prepare_noise_cov(noise_cov, info, ch_names) - - W = np.zeros((n_chan, n_chan), dtype=np.float) - # - # Omit the zeroes due to projection - # - eig = noise_cov['eig'] - nzero = (eig > 0) - W[nzero, nzero] = 1.0 / np.sqrt(eig[nzero]) - n_nzero = sum(nzero) - # - # Rows of eigvec are the eigenvectors - # - W = np.dot(W, noise_cov['eigvec']) - - gain = forward['sol']['data'] - - fwd_idx = [fwd_ch_names.index(name) for name in ch_names] - gain = gain[fwd_idx] + ch_names, gain, noise_cov, whitener, n_nzero = \ + _prepare_inverse(forward, info, noise_cov) n_dipoles = gain.shape[1] @@ -1084,7 +1059,7 @@ def make_inverse_operator(info, forward, noise_cov, loose=0.2, depth=0.8): # Whiten lead field. print 'Whitening lead field matrix.' - gain = np.dot(W, gain) + gain = np.dot(whitener, gain) source_cov = depth_prior.copy() depth_prior = dict(data=depth_prior, kind=FIFF.FIFFV_MNE_DEPTH_PRIOR_COV, -- 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
