This is an automated email from the git hooks/post-receive script. yoh pushed a commit to annotated tag v0.1 in repository python-mne.
commit 25ad2d262e1b1c3d211b95d265b90bfb90d058c4 Merge: a3d1ccb 0ef5163 Author: Emily Ruzich <[email protected]> Date: Tue May 10 14:05:20 2011 -0400 Merge branch 'manual' of git://github.com/mne-tools/mne-python Conflicts: doc/source/manual/forward.rst Makefile | 2 +- doc/Makefile | 4 + .../{tutorial.rst => command_line_tutorial.rst} | 4 +- doc/source/conf.py | 3 + doc/source/getting_started.rst | 2 +- doc/source/getting_started_at_martinos.rst | 14 +- doc/source/index.rst | 41 +- doc/source/manual.rst | 28 + doc/source/manual/analyze.rst | 3 +- doc/source/manual/browse.rst | 57 +- doc/source/manual/convert.rst | 87 +- doc/source/manual/cookbook.rst | 6 +- doc/source/manual/forward.rst | 66 +- doc/source/mne-python.rst | 3 +- examples/plot_compute_mne_inverse.py | 25 +- examples/plot_estimate_covariance_matrix.py | 27 +- examples/plot_from_raw_to_epochs_to_evoked.py | 18 +- ...ne_inverse.py => plot_minimum_norm_estimate.py} | 30 +- examples/plot_minimum_norm_raw_data_in_label.py | 54 ++ examples/plot_morph_data.py | 42 + examples/plot_read_and_write_raw_data.py | 16 +- examples/plot_read_epochs.py | 70 +- examples/plot_read_evoked.py | 33 +- examples/plot_read_forward.py | 8 +- examples/plot_read_noise_covariance_matrix.py | 4 +- examples/plot_read_source_space.py | 9 +- examples/plot_read_stc.py | 13 +- examples/plot_whiten_forward_solution.py | 41 - examples/plot_whitened_evoked_data.py | 60 +- examples/read_bem_surfaces.py | 8 +- examples/read_inverse.py | 6 +- .../plot_cluster_1samp_test_time_frequency.py | 85 +- examples/stats/plot_cluster_stats_evoked.py | 23 +- .../stats/plot_cluster_stats_time_frequency.py | 55 +- examples/stats/plot_sensor_permutation_test.py | 12 +- .../plot_source_space_time_frequency.py | 67 ++ examples/time_frequency/plot_time_frequency.py | 31 +- mne/__init__.py | 9 +- mne/cov.py | 541 +++++++++---- mne/epochs.py | 236 ++++-- mne/event.py | 15 +- mne/fiff/__init__.py | 3 +- mne/fiff/bunch.py | 2 +- mne/fiff/channels.py | 3 +- mne/fiff/compensator.py | 52 +- mne/fiff/constants.py | 94 +-- mne/fiff/ctf.py | 21 +- mne/fiff/diff.py | 4 +- mne/fiff/evoked.py | 318 ++++---- mne/fiff/matrix.py | 22 +- mne/fiff/meas_info.py | 163 +++- mne/fiff/open.py | 11 +- mne/fiff/pick.py | 85 +- mne/fiff/proj.py | 163 ++-- mne/fiff/raw.py | 111 ++- mne/fiff/tag.py | 124 +-- mne/fiff/tests/data/test-ave.fif | Bin 5546473 -> 5546473 bytes mne/fiff/tests/data/test-cov.fif | Bin 541025 -> 541025 bytes mne/fiff/tests/data/test.ave | 2 +- mne/fiff/tests/data/test.cov | 12 +- mne/fiff/tests/data/test_empty_room.cov | 44 + mne/fiff/tests/data/test_erm-cov.fif | Bin 0 -> 541025 bytes mne/fiff/tests/test_evoked.py | 16 +- mne/fiff/tests/test_raw.py | 20 +- mne/fiff/tree.py | 18 +- mne/fiff/write.py | 218 +---- mne/forward.py | 131 +-- mne/inverse.py | 487 ----------- mne/label.py | 11 +- mne/layouts/__init__.py | 2 +- mne/layouts/layout.py | 16 +- mne/minimum_norm/__init__.py | 3 + mne/minimum_norm/inverse.py | 890 +++++++++++++++++++++ mne/minimum_norm/tests/__init__.py | 0 mne/minimum_norm/tests/test_inverse.py | 55 ++ mne/minimum_norm/tests/test_time_frequency.py | 54 ++ mne/minimum_norm/time_frequency.py | 223 ++++++ mne/misc.py | 100 +++ mne/preprocessing.py | 25 +- mne/source_estimate.py | 363 +++++++++ mne/source_space.py | 57 +- mne/stats/__init__.py | 3 +- mne/stats/cluster_level.py | 61 +- mne/stats/parametric.py | 12 +- mne/stats/permutations.py | 54 +- mne/stats/tests/test_cluster_level.py | 8 +- mne/stc.py | 100 --- mne/{bem_surfaces.py => surface.py} | 130 +-- mne/tests/test_cov.py | 62 +- mne/tests/test_epochs.py | 50 +- mne/tests/test_event.py | 2 +- mne/tests/test_inverse.py | 32 - mne/tests/test_label.py | 1 + mne/tests/test_misc.py | 12 + mne/tests/{test_stc.py => test_source_estimate.py} | 29 + mne/tests/test_source_space.py | 16 +- .../{test_bem_surfaces.py => test_surface.py} | 1 + mne/tests/test_viz.py | 2 - mne/time_frequency/tests/test_tfr.py | 4 +- mne/time_frequency/tfr.py | 69 +- mne/transforms.py | 63 +- mne/viz.py | 141 +++- 102 files changed, 4310 insertions(+), 2323 deletions(-) -- 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
