[med-svn] [python-mne] 37/376: fix in doc + bsd license
Yaroslav Halchenko
debian at onerussian.com
Fri Nov 27 17:22:02 UTC 2015
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 ece75579d1048ebbb87f6f378d1bb3c96d026995
Author: Alexandre Gramfort <alexandre.gramfort at inria.fr>
Date: Wed Jan 19 16:30:01 2011 -0500
fix in doc + bsd license
---
README.rst | 4 +--
doc/source/_static/logo.png | Bin 73029 -> 85487 bytes
doc/source/_templates/layout.html | 4 +--
..._mne_inverse.py => plot_compute_mne_inverse.py} | 12 +++++--
examples/{read_evoked.py => plot_read_evoked.py} | 8 ++++-
...cov.py => plot_read_noise_covariance_matrix.py} | 8 ++++-
examples/{read_raw.py => plot_read_raw_data.py} | 8 ++++-
examples/read_bem_surfaces.py | 8 ++++-
examples/read_epochs.py | 8 +++--
examples/read_events.py | 4 +++
examples/read_forward.py | 4 +++
examples/read_inverse.py | 4 +++
examples/read_stc.py | 4 +++
examples/read_write_raw.py | 4 +++
mne/bem_surfaces.py | 5 +--
mne/cov.py | 5 +--
mne/epochs.py | 6 ++--
mne/event.py | 5 +--
mne/fiff/__init__.py | 5 +++
mne/fiff/bunch.py | 5 +++
mne/fiff/channels.py | 5 +--
mne/fiff/constants.py | 7 ++--
mne/fiff/ctf.py | 5 +--
mne/fiff/evoked.py | 5 +--
mne/fiff/matrix.py | 6 ++--
mne/fiff/meas_info.py | 5 +--
mne/fiff/open.py | 6 ++--
mne/fiff/pick.py | 6 ++--
mne/fiff/proj.py | 6 ++--
mne/fiff/raw.py | 6 ++--
mne/fiff/tag.py | 5 +--
mne/fiff/tree.py | 5 +--
mne/fiff/write.py | 5 +--
mne/forward.py | 5 +--
mne/inverse.py | 5 +--
mne/source_space.py | 5 +--
mne/stc.py | 5 +--
mne/tests/test_bem_surfaces.py | 2 +-
mne/tests/test_epochs.py | 36 +++++++++++++++++++++
mne/tests/test_forward.py | 2 +-
mne/tests/test_inverse.py | 2 +-
mne/tests/test_stc.py | 2 +-
42 files changed, 181 insertions(+), 66 deletions(-)
diff --git a/README.rst b/README.rst
index cc85dde..608c33f 100644
--- a/README.rst
+++ b/README.rst
@@ -5,13 +5,13 @@ About
MNE is a python module for processing MEG and EEG data.
-It is a project funded by:
+It is a project initiated:
Athinoula A. Martinos Center for Biomedical Imaging
Massachusetts General Hospital
Charlestown, MA, USA
-Available under the BSD license.
+Available under the Simplified BSD license (3-Clause).
It is mainly a reimplementation of the Matlab code written by Matti Hämäläinen.
diff --git a/doc/source/_static/logo.png b/doc/source/_static/logo.png
index 3bda59a..66718cb 100644
Binary files a/doc/source/_static/logo.png and b/doc/source/_static/logo.png differ
diff --git a/doc/source/_templates/layout.html b/doc/source/_templates/layout.html
index 1467467..846e4bc 100644
--- a/doc/source/_templates/layout.html
+++ b/doc/source/_templates/layout.html
@@ -10,10 +10,10 @@
{% block relbar1 %}
-<!-- <div style="background-color: white; text-align: left; padding: 10px 10px 15px 15px">
+<div style="background-color: white; text-align: left; padding: 10px 10px 15px 15px">
<a href="{{ pathto('index') }}"><img src="{{
pathto("_static/logo.png", 1) }}" border="0" alt="py4sci"/></a>
-</div> -->
+</div>
{{ super() }}
{% endblock %}
diff --git a/examples/compute_mne_inverse.py b/examples/plot_compute_mne_inverse.py
similarity index 52%
rename from examples/compute_mne_inverse.py
rename to examples/plot_compute_mne_inverse.py
index ed97060..da23a6a 100644
--- a/examples/compute_mne_inverse.py
+++ b/examples/plot_compute_mne_inverse.py
@@ -3,12 +3,20 @@
Compute MNE inverse solution
============================
"""
+
+# Author: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+#
+# License: Simplified BSD
+
print __doc__
+import os
import mne
-fname_inv = 'MNE-sample-data/MEG/sample/sample_audvis-meg-oct-6-meg-inv.fif'
-fname_data = 'MNE-sample-data/MEG/sample/sample_audvis-ave.fif'
+fname_inv = os.environ['MNE_SAMPLE_DATASET_PATH']
+fname_inv += '/MEG/sample/sample_audvis-meg-oct-6-meg-inv.fif'
+fname_data = os.environ['MNE_SAMPLE_DATASET_PATH']
+fname_data += '/MEG/sample/sample_audvis-ave.fif'
setno = 0
lambda2 = 10
diff --git a/examples/read_evoked.py b/examples/plot_read_evoked.py
similarity index 71%
rename from examples/read_evoked.py
rename to examples/plot_read_evoked.py
index 89bd0ff..d7d0c4c 100644
--- a/examples/read_evoked.py
+++ b/examples/plot_read_evoked.py
@@ -4,11 +4,17 @@ Reading and writing an evoked file
==================================
"""
+# Author: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+#
+# License: Simplified BSD
+
print __doc__
+import os
from mne import fiff
-fname = 'MNE-sample-data/MEG/sample/sample_audvis-ave.fif'
+fname = os.environ['MNE_SAMPLE_DATASET_PATH']
+fname += '/MEG/sample/sample_audvis-ave.fif'
# Reading
data = fiff.read_evoked(fname)
diff --git a/examples/read_cov.py b/examples/plot_read_noise_covariance_matrix.py
similarity index 74%
rename from examples/read_cov.py
rename to examples/plot_read_noise_covariance_matrix.py
index 9edffcd..2ea2211 100644
--- a/examples/read_cov.py
+++ b/examples/plot_read_noise_covariance_matrix.py
@@ -3,12 +3,18 @@
Reading/Writing a noise covariance matrix
=========================================
"""
+# Author: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+#
+# License: Simplified BSD
+
print __doc__
+import os
import mne
from mne import fiff
-fname = 'MNE-sample-data/MEG/sample/sample_audvis-cov.fif'
+fname = os.environ['MNE_SAMPLE_DATASET_PATH']
+fname += '/MEG/sample/sample_audvis-cov.fif'
# Reading
fid, tree, _ = fiff.fiff_open(fname)
diff --git a/examples/read_raw.py b/examples/plot_read_raw_data.py
similarity index 78%
rename from examples/read_raw.py
rename to examples/plot_read_raw_data.py
index 618084b..8074f84 100644
--- a/examples/read_raw.py
+++ b/examples/plot_read_raw_data.py
@@ -3,11 +3,17 @@
Reading a raw file segment
==========================
"""
+# Author: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+#
+# License: Simplified BSD
+
print __doc__
+import os
from mne import fiff
-fname = 'MNE-sample-data/MEG/sample/sample_audvis_raw.fif'
+fname = os.environ['MNE_SAMPLE_DATASET_PATH']
+fname += '/MEG/sample/sample_audvis_raw.fif'
raw = fiff.setup_read_raw(fname)
diff --git a/examples/read_bem_surfaces.py b/examples/read_bem_surfaces.py
index c4faa5d..20766fc 100644
--- a/examples/read_bem_surfaces.py
+++ b/examples/read_bem_surfaces.py
@@ -3,11 +3,17 @@
Reading BEM surfaces from a forward solution
============================================
"""
+# Author: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+#
+# License: Simplified BSD
+
print __doc__
import mne
-fname = 'MNE-sample-data/subjects/sample/bem/sample-5120-5120-5120-bem-sol.fif'
+
+fname = os.environ['MNE_SAMPLE_DATASET_PATH']
+fname += '/subjects/sample/bem/sample-5120-5120-5120-bem-sol.fif'
surfaces = mne.read_bem_surfaces(fname)
diff --git a/examples/read_epochs.py b/examples/read_epochs.py
index 9be2862..a06a675 100644
--- a/examples/read_epochs.py
+++ b/examples/read_epochs.py
@@ -3,10 +3,12 @@
Reading epochs from a raw FIF file
==================================
"""
-print __doc__
+# Authors: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Matti Hamalainen <msh at nmr.mgh.harvard.edu>
+#
+# License: Simplified BSD
-# Authors : Alexandre Gramfort, gramfort at nmr.mgh.harvard.edu
-# Matti Hamalainen, msh at nmr.mgh.harvard.edu
+print __doc__
import mne
from mne import fiff
diff --git a/examples/read_events.py b/examples/read_events.py
index 3932161..211c3c9 100644
--- a/examples/read_events.py
+++ b/examples/read_events.py
@@ -3,6 +3,10 @@
Reading an event file
=====================
"""
+# Author: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+#
+# License: Simplified BSD
+
print __doc__
import mne
diff --git a/examples/read_forward.py b/examples/read_forward.py
index c6377f0..08557bf 100644
--- a/examples/read_forward.py
+++ b/examples/read_forward.py
@@ -3,6 +3,10 @@
Reading a forward operator a.k.a. lead field matrix
===================================================
"""
+# Author: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+#
+# License: Simplified BSD
+
print __doc__
import mne
diff --git a/examples/read_inverse.py b/examples/read_inverse.py
index 00025ed..fde542a 100644
--- a/examples/read_inverse.py
+++ b/examples/read_inverse.py
@@ -3,6 +3,10 @@
Reading an inverse operator
===========================
"""
+# Author: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+#
+# License: Simplified BSD
+
print __doc__
import mne
diff --git a/examples/read_stc.py b/examples/read_stc.py
index d5acd0e..50844ed 100644
--- a/examples/read_stc.py
+++ b/examples/read_stc.py
@@ -6,6 +6,10 @@ Reading an STC file
STC files contain activations on cortex ie. source
reconstructions
"""
+# Author: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+#
+# License: Simplified BSD
+
print __doc__
import mne
diff --git a/examples/read_write_raw.py b/examples/read_write_raw.py
index d340cf8..8456e4e 100644
--- a/examples/read_write_raw.py
+++ b/examples/read_write_raw.py
@@ -5,6 +5,10 @@ Read and write raw data
Read and write raw data in 60-sec blocks
"""
+# Author: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+#
+# License: Simplified BSD
+
print __doc__
from math import ceil
diff --git a/mne/bem_surfaces.py b/mne/bem_surfaces.py
index b878914..03feee0 100644
--- a/mne/bem_surfaces.py
+++ b/mne/bem_surfaces.py
@@ -1,6 +1,7 @@
-# Author: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Authors: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Matti Hamalainen <msh at nmr.mgh.harvard.edu>
#
-# License: BSD Style.
+# License: Simplified BSD
import numpy as np
from scipy import linalg
diff --git a/mne/cov.py b/mne/cov.py
index 4b2aa04..720ac3f 100644
--- a/mne/cov.py
+++ b/mne/cov.py
@@ -1,6 +1,7 @@
-# Author: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Authors: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Matti Hamalainen <msh at nmr.mgh.harvard.edu>
#
-# License: BSD Style.
+# License: Simplified BSD
import os
import numpy as np
diff --git a/mne/epochs.py b/mne/epochs.py
index c9aeb04..4a99c94 100644
--- a/mne/epochs.py
+++ b/mne/epochs.py
@@ -1,7 +1,7 @@
-# Author: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Authors: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Matti Hamalainen <msh at nmr.mgh.harvard.edu>
#
-# License: BSD Style.
-
+# License: Simplified BSD
import numpy as np
import fiff
diff --git a/mne/event.py b/mne/event.py
index 4f7fa6a..a538f16 100644
--- a/mne/event.py
+++ b/mne/event.py
@@ -1,9 +1,10 @@
"""IO with fif files containing events
"""
-# Author: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Authors: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Matti Hamalainen <msh at nmr.mgh.harvard.edu>
#
-# License: BSD Style.
+# License: Simplified BSD
from .fiff.constants import FIFF
from .fiff.tree import dir_tree_find
diff --git a/mne/fiff/__init__.py b/mne/fiff/__init__.py
index f85d4d6..f10aec1 100644
--- a/mne/fiff/__init__.py
+++ b/mne/fiff/__init__.py
@@ -1,3 +1,8 @@
+# Authors: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Matti Hamalainen <msh at nmr.mgh.harvard.edu>
+#
+# License: Simplified BSD
+
__version__ = '0.1.git'
from .constants import FIFF
diff --git a/mne/fiff/bunch.py b/mne/fiff/bunch.py
index e26affb..d31927f 100644
--- a/mne/fiff/bunch.py
+++ b/mne/fiff/bunch.py
@@ -1,3 +1,8 @@
+# Authors: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Matti Hamalainen <msh at nmr.mgh.harvard.edu>
+#
+# License: Simplified BSD
+
class Bunch(dict):
""" Container object for datasets: dictionnary-like object that
exposes its keys as attributes.
diff --git a/mne/fiff/channels.py b/mne/fiff/channels.py
index 8c057be..402bec5 100644
--- a/mne/fiff/channels.py
+++ b/mne/fiff/channels.py
@@ -1,6 +1,7 @@
-# Author: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Authors: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Matti Hamalainen <msh at nmr.mgh.harvard.edu>
#
-# License: BSD Style.
+# License: Simplified BSD
from .tree import dir_tree_find
from .tag import find_tag
diff --git a/mne/fiff/constants.py b/mne/fiff/constants.py
index 42fafe5..ec59aeb 100644
--- a/mne/fiff/constants.py
+++ b/mne/fiff/constants.py
@@ -1,10 +1,11 @@
-# Author: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
-# Matti Hamalainen <msh at nmr.mgh.harvard.edu>
+# Authors: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Matti Hamalainen <msh at nmr.mgh.harvard.edu>
#
-# License: BSD Style.
+# License: Simplified BSD
from bunch import Bunch
+
FIFF = Bunch()
#
diff --git a/mne/fiff/ctf.py b/mne/fiff/ctf.py
index e64e9d5..9767bf1 100644
--- a/mne/fiff/ctf.py
+++ b/mne/fiff/ctf.py
@@ -1,6 +1,7 @@
-# Author: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Authors: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Matti Hamalainen <msh at nmr.mgh.harvard.edu>
#
-# License: BSD Style.
+# License: Simplified BSD
import numpy as np
diff --git a/mne/fiff/evoked.py b/mne/fiff/evoked.py
index 09c1152..f45272c 100644
--- a/mne/fiff/evoked.py
+++ b/mne/fiff/evoked.py
@@ -1,6 +1,7 @@
-# Author: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Authors: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Matti Hamalainen <msh at nmr.mgh.harvard.edu>
#
-# License: BSD Style.
+# License: Simplified BSD
import numpy as np
diff --git a/mne/fiff/matrix.py b/mne/fiff/matrix.py
index 8f61d4d..a59061e 100644
--- a/mne/fiff/matrix.py
+++ b/mne/fiff/matrix.py
@@ -1,7 +1,7 @@
-# Author: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
-# Matti Hamalainen <msh at nmr.mgh.harvard.edu>
+# Authors: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Matti Hamalainen <msh at nmr.mgh.harvard.edu>
#
-# License: BSD Style.
+# License: Simplified BSD
from .constants import FIFF
from .tag import find_tag, has_tag
diff --git a/mne/fiff/meas_info.py b/mne/fiff/meas_info.py
index c1edc6e..27da9af 100644
--- a/mne/fiff/meas_info.py
+++ b/mne/fiff/meas_info.py
@@ -1,6 +1,7 @@
-# Author: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Authors: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Matti Hamalainen <msh at nmr.mgh.harvard.edu>
#
-# License: BSD Style.
+# License: Simplified BSD
import numpy as np
diff --git a/mne/fiff/open.py b/mne/fiff/open.py
index 9c0fed7..c200fe7 100644
--- a/mne/fiff/open.py
+++ b/mne/fiff/open.py
@@ -1,7 +1,7 @@
-# Author: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
-# Matti Hamalainen <msh at nmr.mgh.harvard.edu>
+# Authors: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Matti Hamalainen <msh at nmr.mgh.harvard.edu>
#
-# License: BSD Style.
+# License: Simplified BSD
from .tag import read_tag_info, read_tag
from .tree import make_dir_tree
diff --git a/mne/fiff/pick.py b/mne/fiff/pick.py
index 5d5abbe..45f1364 100644
--- a/mne/fiff/pick.py
+++ b/mne/fiff/pick.py
@@ -1,7 +1,7 @@
-# Author: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
-# Matti Hamalainen <msh at nmr.mgh.harvard.edu>
+# Authors: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Matti Hamalainen <msh at nmr.mgh.harvard.edu>
#
-# License: BSD Style.
+# License: Simplified BSD
from copy import copy
diff --git a/mne/fiff/proj.py b/mne/fiff/proj.py
index 788b895..2c5cb96 100644
--- a/mne/fiff/proj.py
+++ b/mne/fiff/proj.py
@@ -1,7 +1,7 @@
-# Author: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
-# Matti Hamalainen <msh at nmr.mgh.harvard.edu>
+# Authors: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Matti Hamalainen <msh at nmr.mgh.harvard.edu>
#
-# License: BSD Style.
+# License: Simplified BSD
from math import sqrt
import numpy as np
diff --git a/mne/fiff/raw.py b/mne/fiff/raw.py
index 44ea075..a62ae86 100644
--- a/mne/fiff/raw.py
+++ b/mne/fiff/raw.py
@@ -1,7 +1,7 @@
-# Author: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
-# Matti Hamalainen <msh at nmr.mgh.harvard.edu>
+# Authors: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Matti Hamalainen <msh at nmr.mgh.harvard.edu>
#
-# License: BSD Style.
+# License: Simplified BSD
from math import floor, ceil
import numpy as np
diff --git a/mne/fiff/tag.py b/mne/fiff/tag.py
index 021636b..e01de07 100644
--- a/mne/fiff/tag.py
+++ b/mne/fiff/tag.py
@@ -1,6 +1,7 @@
-# Author: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Authors: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Matti Hamalainen <msh at nmr.mgh.harvard.edu>
#
-# License: BSD Style.
+# License: Simplified BSD
import struct
import numpy as np
diff --git a/mne/fiff/tree.py b/mne/fiff/tree.py
index 9c2b92a..a1d7b18 100644
--- a/mne/fiff/tree.py
+++ b/mne/fiff/tree.py
@@ -1,6 +1,7 @@
-# Author: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Authors: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Matti Hamalainen <msh at nmr.mgh.harvard.edu>
#
-# License: BSD Style.
+# License: Simplified BSD
from .bunch import Bunch
from .tag import read_tag
diff --git a/mne/fiff/write.py b/mne/fiff/write.py
index 20144bf..c82c38a 100644
--- a/mne/fiff/write.py
+++ b/mne/fiff/write.py
@@ -1,6 +1,7 @@
-# Author: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Authors: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Matti Hamalainen <msh at nmr.mgh.harvard.edu>
#
-# License: BSD Style.
+# License: Simplified BSD
import time
import array
diff --git a/mne/forward.py b/mne/forward.py
index c8922e5..455c8e7 100644
--- a/mne/forward.py
+++ b/mne/forward.py
@@ -1,6 +1,7 @@
-# Author: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Authors: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Matti Hamalainen <msh at nmr.mgh.harvard.edu>
#
-# License: BSD Style.
+# License: Simplified BSD
import copy
import numpy as np
diff --git a/mne/inverse.py b/mne/inverse.py
index 53d92b7..6886ee4 100644
--- a/mne/inverse.py
+++ b/mne/inverse.py
@@ -1,6 +1,7 @@
-# Author: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Authors: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Matti Hamalainen <msh at nmr.mgh.harvard.edu>
#
-# License: BSD Style.
+# License: Simplified BSD
from math import sqrt
import numpy as np
diff --git a/mne/source_space.py b/mne/source_space.py
index 074c82a..efb0717 100644
--- a/mne/source_space.py
+++ b/mne/source_space.py
@@ -1,6 +1,7 @@
-# Author: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Authors: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Matti Hamalainen <msh at nmr.mgh.harvard.edu>
#
-# License: BSD Style.
+# License: Simplified BSD
from math import sqrt
import numpy as np
diff --git a/mne/stc.py b/mne/stc.py
index cb9c4e5..f874d72 100644
--- a/mne/stc.py
+++ b/mne/stc.py
@@ -1,6 +1,7 @@
-# Author: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Authors: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+# Matti Hamalainen <msh at nmr.mgh.harvard.edu>
#
-# License: BSD Style.
+# License: Simplified BSD
import numpy as np
diff --git a/mne/tests/test_bem_surfaces.py b/mne/tests/test_bem_surfaces.py
index 2579b8e..1703fc9 100644
--- a/mne/tests/test_bem_surfaces.py
+++ b/mne/tests/test_bem_surfaces.py
@@ -8,7 +8,7 @@ import mne
MNE_SAMPLE_DATASET_PATH = os.getenv('MNE_SAMPLE_DATASET_PATH')
fname = op.join(MNE_SAMPLE_DATASET_PATH, 'subjects', 'sample', 'bem',
- 'sample-5120-bem-sol.fif')
+ 'sample-5120-5120-5120-bem-sol.fif')
def test_io_bem_surfaces():
"""Testing reading of bem surfaces
diff --git a/mne/tests/test_epochs.py b/mne/tests/test_epochs.py
new file mode 100644
index 0000000..a190e4d
--- /dev/null
+++ b/mne/tests/test_epochs.py
@@ -0,0 +1,36 @@
+# Author: Alexandre Gramfort <gramfort at nmr.mgh.harvard.edu>
+#
+# License: Simplified BSD
+
+import os
+import os.path as op
+
+import mne
+from mne import fiff
+
+MNE_SAMPLE_DATASET_PATH = os.getenv('MNE_SAMPLE_DATASET_PATH')
+raw_fname = op.join(MNE_SAMPLE_DATASET_PATH, 'MEG', 'sample',
+ 'sample_audvis_raw.fif')
+event_name = op.join(MNE_SAMPLE_DATASET_PATH, 'MEG', 'sample',
+ 'sample_audvis_raw-eve.fif')
+
+
+def test_read_epochs():
+ event_id = 1
+ tmin = -0.2
+ tmax = 0.5
+
+ # Setup for reading the raw data
+ raw = fiff.setup_read_raw(raw_fname)
+ events = mne.read_events(event_name)
+
+ # Set up pick list: MEG + STI 014 - bad channels (modify to your needs)
+ include = ['STI 014'];
+ want_meg = True
+ want_eeg = False
+ want_stim = False
+ picks = fiff.pick_types(raw['info'], want_meg, want_eeg, want_stim,
+ include, raw['info']['bads'])
+
+ data, times, channel_names = mne.read_epochs(raw, events, event_id,
+ tmin, tmax, picks=picks)
diff --git a/mne/tests/test_forward.py b/mne/tests/test_forward.py
index dd67505..5f2f85c 100644
--- a/mne/tests/test_forward.py
+++ b/mne/tests/test_forward.py
@@ -7,7 +7,7 @@ import mne
MNE_SAMPLE_DATASET_PATH = os.getenv('MNE_SAMPLE_DATASET_PATH')
fname = op.join(MNE_SAMPLE_DATASET_PATH, 'MEG', 'sample',
- 'sample_audvis-ave-7-fwd.fif')
+ 'sample_audvis-meg-oct-6-fwd.fif')
def test_io_forward():
"""Test IO for forward solutions
diff --git a/mne/tests/test_inverse.py b/mne/tests/test_inverse.py
index be20ccd..d65178b 100644
--- a/mne/tests/test_inverse.py
+++ b/mne/tests/test_inverse.py
@@ -7,7 +7,7 @@ import mne
MNE_SAMPLE_DATASET_PATH = os.getenv('MNE_SAMPLE_DATASET_PATH')
fname = op.join(MNE_SAMPLE_DATASET_PATH, 'MEG', 'sample',
- 'sample_audvis-ave-7-meg-inv.fif')
+ 'sample_audvis-meg-oct-6-meg-inv.fif')
def test_io_forward():
"""Test IO for inverse operator
diff --git a/mne/tests/test_stc.py b/mne/tests/test_stc.py
index 02c5a23..8dc2faa 100644
--- a/mne/tests/test_stc.py
+++ b/mne/tests/test_stc.py
@@ -7,7 +7,7 @@ import mne
MNE_SAMPLE_DATASET_PATH = os.getenv('MNE_SAMPLE_DATASET_PATH')
fname = op.join(MNE_SAMPLE_DATASET_PATH, 'MEG', 'sample',
- 'sample_audvis-ave-7-meg-lh.stc')
+ 'sample_audvis-meg-lh.stc')
def test_io_stc():
"""Test IO for STC files
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-mne.git
More information about the debian-med-commit
mailing list