[WIP] Improvements for generalization round 2 #37
Conversation
mne_bids/utils.py
Outdated
| @@ -93,9 +96,13 @@ def make_bids_filename(subject=None, session=None, task=None, | |||
| filename = [] | |||
| for key, val in order.items(): | |||
| if val is not None: | |||
| if any(ii in val for ii in ['-', '_']): | |||
| raise ValueError("Unallowed `-` or `_` found in key/value pair" | |||
| " %s: %s" % (key, val)) | |||
|
tests are happy! |
|
The example |
|
good call, I got the example working. Why would we need to use Circle to test examples? If we just build the docs as a part of travis then it'll error if one of the scripts errors, no? |
|
Well CircleCI also gives us the built html so we can look at it if we want. I don't know if it's possible in Travis ... but yeah either would do the job as you say |
|
Still one more issue: Traceback (most recent call last):
File "/home/mainak/anaconda2/lib/python2.7/site-packages/sphinx_gallery/gen_rst.py", line 450, in execute_code_block
exec(code_block, example_globals)
File "<string>", line 11, in <module>
File "/home/mainak/Desktop/projects/github_repos/mne-bids/mne_bids/meg_bids.py", line 319, in raw_to_bids
suffix='%s%s' % (kind, ext), prefix=data_path)
File "/home/mainak/Desktop/projects/github_repos/mne-bids/mne_bids/utils.py", line 101, in make_bids_filename
" %s: %s" % (key, val))
ValueError: Unallowed `-` or `_` found in key/value pair task: visual_faces |
|
updated the example + made a few tweaks, let's see if this passes! |
mne_bids/utils.py
Outdated
| def _check_key_val(key, val): | ||
| """Perform checks on a value to make sure it adheres to the spec.""" | ||
| if any(ii in val for ii in ['-', '_', '/']): | ||
| raise ValueError("Unallowed `-` or `_` found in key/value pair" |
There was a problem hiding this comment.
you are missing '/' in the error message
mne_bids/meg_bids.py
Outdated
| @@ -165,6 +165,10 @@ def _coordsystem_json(raw, unit, orient, manufacturer, fname, verbose): | |||
| def _channel_json(raw, task, manufacturer, fname, kind, verbose): | |||
|
|
|||
| sfreq = raw.info['sfreq'] | |||
| powerlinefrequency = raw.info.get('line_freq', None) | |||
| if powerlinefrequency is None: | |||
| print('No line frequency found, defaulting to 40 Hz') | |||
|
@choldgraf looks good for merge to me once you address my nitpicks :) |
|
ok, I believe nitpicks addressed! |
|
Thanks @choldgraf ! |
A few more improvements to generalize this past just MEG data