Skip to content

Commit

Permalink
ENH: Add desc_prefix option
Browse files Browse the repository at this point in the history
  • Loading branch information
larsoner committed Sep 1, 2015
1 parent 38186dd commit ec954b2
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
8 changes: 6 additions & 2 deletions mne/proj.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def _compute_proj(data, info, n_grad, n_mag, n_eeg, desc_prefix, verbose=None):

@verbose
def compute_proj_epochs(epochs, n_grad=2, n_mag=2, n_eeg=2, n_jobs=1,
verbose=None):
desc_prefix=None, verbose=None):
"""Compute SSP (spatial space projection) vectors on Epochs
Parameters
Expand All @@ -128,6 +128,9 @@ def compute_proj_epochs(epochs, n_grad=2, n_mag=2, n_eeg=2, n_jobs=1,
Number of vectors for EEG channels
n_jobs : int
Number of jobs to use to compute covariance
desc_prefix : str | None
The description prefix to use. If None, one will be created based on
the event_id, tmin, and tmax.
verbose : bool, str, int, or None
If not None, override default verbose level (see mne.verbose).
Expand All @@ -149,7 +152,8 @@ def compute_proj_epochs(epochs, n_grad=2, n_mag=2, n_eeg=2, n_jobs=1,
event_id = str(list(event_id.values())[0])
else:
event_id = 'Multiple-events'
desc_prefix = "%s-%-.3f-%-.3f" % (event_id, epochs.tmin, epochs.tmax)
if desc_prefix is None:
desc_prefix = "%s-%-.3f-%-.3f" % (event_id, epochs.tmin, epochs.tmax)
return _compute_proj(data, epochs.info, n_grad, n_mag, n_eeg, desc_prefix)


Expand Down
4 changes: 3 additions & 1 deletion mne/tests/test_proj.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,9 @@ def test_compute_proj_epochs():
# XXX : test something

# test parallelization
projs = compute_proj_epochs(epochs, n_grad=1, n_mag=1, n_eeg=0, n_jobs=2)
projs = compute_proj_epochs(epochs, n_grad=1, n_mag=1, n_eeg=0, n_jobs=2,
desc_prefix='foobar')
assert_true(all('foobar' in x['desc'] for x in projs))
projs = activate_proj(projs)
proj_par, _, _ = make_projector(projs, epochs.ch_names, bads=[])
assert_allclose(proj, proj_par, rtol=1e-8, atol=1e-16)
Expand Down

0 comments on commit ec954b2

Please sign in to comment.