[med-svn] [python-mne] 201/353: Merge pull request #50 from agramfort/sloreta

[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 4f7d7e65f7107b2c747b045f819b546735a31748
Merge: b5a724b 6e00213
Author: mluessi at nmr.mgh.harvard.edu <mluessi at nmr.mgh.harvard.edu>
Date:   Mon Jun 18 02:42:20 2012 -0400

    Merge pull request #50 from agramfort/sloreta

 doc/source/python_tutorial.rst                     | 12 +--
 doc/source/whats_new.rst                           |  2 +
 examples/inverse/plot_compute_mne_inverse.py       | 12 +--
 .../plot_compute_mne_inverse_epochs_in_label.py    |  7 +-
 .../plot_compute_mne_inverse_raw_in_label.py       | 14 ++--
 .../inverse/plot_compute_mne_inverse_volume.py     | 11 ++-
 examples/inverse/plot_make_inverse_operator.py     |  7 +-
 mne/epochs.py                                      |  1 -
 mne/minimum_norm/inverse.py                        | 90 ++++++++++++++--------
 mne/minimum_norm/tests/test_inverse.py             | 31 ++++----
 mne/minimum_norm/time_frequency.py                 | 35 +++++----
 11 files changed, 129 insertions(+), 93 deletions(-)

diff --cc doc/source/whats_new.rst
index cbd5512,97a53bc..5913ccc
--- a/doc/source/whats_new.rst
+++ b/doc/source/whats_new.rst
@@@ -7,10 -9,8 +7,12 @@@ Curren
  Changelog
  ~~~~~~~~~
  
 +   - Add Raw.filter method to more easily band pass data by `Alex Gramfort`_.
 +
 +   - Add tmin + tmax parameters in mne.compute_covariance to estimate noise covariance in epochs baseline without creating new epochs by `Alex Gramfort`_.
 +
+    - Add support for sLORETA in apply_inverse, apply_inverse_raw, apply_inverse_epochs (API Change) by `Alex Gramfort`_.
+ 
     - Add method to regularize a noise covariance by `Alex Gramfort`_.
  
     - Read and write measurement info in forward and inverse operators for interactive visualization in mne_analyze by `Alex Gramfort`_.

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