Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MRG] FIX: Convert line_freq and overwrite to proper types in CLI #1125

Merged
merged 6 commits into from Mar 9, 2023
Merged

[MRG] FIX: Convert line_freq and overwrite to proper types in CLI #1125

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a154945
show error
sappelhoff Mar 8, 2023
41eac07
FIX: convert line_freq and overwrite to proper types
sappelhoff Mar 8, 2023
bd7874b
fix flake
sappelhoff Mar 8, 2023
d7741d6
add whatsnew
sappelhoff Mar 8, 2023
a01a6f8
remove unneeded bool call
sappelhoff Mar 8, 2023
adad062
Merge branch 'main' into clifix
sappelhoff Mar 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 10 additions & 1 deletion mne_bids/commands/mne_bids_raw_to_bids.py
View file
Open in desktop
Expand Up @@ -8,6 +8,8 @@
# Stefan Appelhoff <stefan.appelhoff@mailbox.org>
#
# License: BSD-3-Clause
from itertools import chain, repeat

import mne_bids
from mne_bids import write_raw_bids, BIDSPath
from mne_bids.read import _read_raw
Expand Down Expand Up @@ -80,9 +82,16 @@ def run():
hsp=opt.hsp, config_path=opt.config,
allow_maxshield=allow_maxshield)
if opt.line_freq is not None:
line_freq = None if opt.line_freq == "None" else opt.line_freq
line_freq = None if opt.line_freq == "None" else float(opt.line_freq)
raw.info['line_freq'] = line_freq

if opt.overwrite is not None:
truthy = [1, "True", "true"]
falsy = [0, "False", "false"]
bool_mapping = dict(
chain(zip(truthy, repeat(True)), zip(falsy, repeat(False))))
opt.overwrite = bool(bool_mapping[opt.overwrite])

write_raw_bids(raw, bids_path, event_id=opt.event_id,
events=opt.events, overwrite=opt.overwrite,
events_data=opt.events_data, verbose=True)
Expand Down
4 changes: 2 additions & 2 deletions mne_bids/commands/tests/test_cli.py
View file
Open in desktop
Expand Up @@ -67,7 +67,7 @@ def test_raw_to_bids(tmp_path):
# Should work
with ArgvSetter(('--subject_id', subject_id, '--task', task, '--raw',
raw_fname, '--bids_root', output_path,
'--line_freq', 60)):
'--line_freq', "60")):
mne_bids_raw_to_bids.run()

# Test line_freq == 'None'
Expand All @@ -81,7 +81,7 @@ def test_raw_to_bids(tmp_path):
edf_fname = op.join(edf_data_path, 'test.edf')
with ArgvSetter(('--subject_id', subject_id, '--task', task, '--raw',
edf_fname, '--bids_root', output_path,
'--line_freq', 60)):
'--overwrite', "false", '--line_freq', 60)):
mne_bids_raw_to_bids.run()

# Too few input args
Expand Down