[med-svn] [python-mne] 215/353: Merge branch 'master' of github.com:mne-tools/mne-python

[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 587ee2b975d22a6a1e73c46621082094978ebddc
Merge: 13a83e6 6c25cd8
Author: Alexandre Gramfort <alexandre.gramfort at inria.fr>
Date:   Wed Jun 20 12:02:51 2012 +0300

    Merge branch 'master' of github.com:mne-tools/mne-python
    
    Conflicts:
    	doc/source/whats_new.rst

 doc/source/whats_new.rst                 |   4 ++
 examples/inverse/plot_lcmv_beamformer.py |  73 ++++++++++++++++++++
 mne/__init__.py                          |   1 +
 mne/beamformer/__init__.py               |   4 ++
 mne/beamformer/_lcmv.py                  | 114 +++++++++++++++++++++++++++++++
 mne/beamformer/tests/__init__.py         |   0
 mne/beamformer/tests/test_lcmv.py        |  66 ++++++++++++++++++
 mne/cov.py                               |  44 ++++++++++++
 mne/data/mne_analyze.sel                 |  13 ++++
 mne/fiff/pick.py                         |  16 ++++-
 mne/fiff/tests/test_pick.py              |   1 +
 mne/selection.py                         |  99 +++++++++++++++++++++++++++
 mne/tests/test_selection.py              |  29 ++++++++
 setup.py                                 |   1 +
 14 files changed, 463 insertions(+), 2 deletions(-)

diff --cc doc/source/whats_new.rst
index 0985f76,55157f6..97d87d7
--- a/doc/source/whats_new.rst
+++ b/doc/source/whats_new.rst
@@@ -7,8 -7,10 +7,12 @@@ Curren
  Changelog
  ~~~~~~~~~
  
 +   - Backporting scipy.signa.firwin2 so filtering works with old scipy by `Alex Gramfort`_.
 +
+    - LCMV Beamformer by `Alex Gramfort`_.
+ 
+    - Add support for reading named channel selections by `Martin Luessi`_.
+ 
     - 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`_.

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