[med-svn] [python-mne] 62/353: Merge branch 'inv_raw_lessmem'

[Yaroslav Halchenko]

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 a3160e3c62143d80738b4863f904700c50d7eef7
Merge: 5603114 de324e3
Author: Alexandre Gramfort <alexandre.gramfort at inria.fr>
Date:   Sun Jan 22 15:03:56 2012 +0100

    Merge branch 'inv_raw_lessmem'

 mne/forward.py                         | 11 +++++
 mne/minimum_norm/inverse.py            | 85 +++++++++++++++++++++++-----------
 mne/minimum_norm/tests/test_inverse.py | 78 +++++++++++++++++++++++++++++--
 3 files changed, 142 insertions(+), 32 deletions(-)

diff --cc mne/minimum_norm/inverse.py
index 7d331da,101d7b5..54301b5
--- a/mne/minimum_norm/inverse.py
+++ b/mne/minimum_norm/inverse.py
@@@ -15,9 -15,10 +15,9 @@@ from ..fiff.tag import find_ta
  from ..fiff.matrix import _read_named_matrix, _transpose_named_matrix
  from ..fiff.proj import read_proj, make_projector
  from ..fiff.tree import dir_tree_find
 -from ..fiff.pick import pick_channels
  
  from ..cov import read_cov, prepare_noise_cov
- from ..forward import compute_depth_prior
+ from ..forward import compute_depth_prior, compute_depth_prior_fixed
  from ..source_space import read_source_spaces_from_tree, \
                             find_source_space_hemi, _get_vertno
  from ..transforms import invert_transform, transform_source_space_to

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-mne.git