Skip to content

Commit

Permalink
FIX: don't use "rec" for recording entity. Use the full name
Browse files Browse the repository at this point in the history
  • Loading branch information
scott-huberty committed Dec 20, 2024
1 parent 46f284b commit b2b421d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion mne_bids/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@
"run": "run",
"proc": "processing",
"space": "space",
"rec": "recording",
"recording": "recording",
"split": "split",
"desc": "description",
}
Expand Down
6 changes: 4 additions & 2 deletions mne_bids/path.py
Original file line number Diff line number Diff line change
Expand Up @@ -2088,7 +2088,7 @@ def get_entity_vals(
):
continue
if ignore_recordings and any(
[f"_rec-{a}_" in filename.stem for a in ignore_recordings]
[f"_recording-{a}_" in filename.stem for a in ignore_recordings]
):
continue
if ignore_splits and any(
Expand Down Expand Up @@ -2280,7 +2280,9 @@ def _filter_fnames(
r"_proc-(" + "|".join(processing) + ")" if processing else r"(|_proc-([^_]+))"
)
space_str = r"_space-(" + "|".join(space) + ")" if space else r"(|_space-([^_]+))"
rec_str = r"_rec-(" + "|".join(recording) + ")" if recording else r"(|_rec-([^_]+))"
rec_str = (r"_recording-(" + "|".join(recording) + ")"
if recording else r"(|_recording-([^_]+))"
)
split_str = r"_split-(" + "|".join(split) + ")" if split else r"(|_split-([^_]+))"
desc_str = (
r"_desc-(" + "|".join(description) + ")" if description else r"(|_desc-([^_]+))"
Expand Down
4 changes: 2 additions & 2 deletions mne_bids/tests/test_path.py
Original file line number Diff line number Diff line change
Expand Up @@ -857,7 +857,7 @@ def test_make_filenames():
datatype="ieeg",
)
expected_str = (
"sub-one_ses-two_task-three_acq-four_run-1_proc-six_rec-seven_ieeg.json"
"sub-one_ses-two_task-three_acq-four_run-1_proc-six_recording-seven_ieeg.json"
)
assert BIDSPath(**prefix_data).basename == expected_str
assert (
Expand Down Expand Up @@ -896,7 +896,7 @@ def test_make_filenames():
basename = BIDSPath(**prefix_data, check=False)
assert (
basename.basename
== "sub-one_ses-two_task-three_acq-four_run-1_proc-six_rec-seven_ieeg.h5"
== "sub-one_ses-two_task-three_acq-four_run-1_proc-six_recording-seven_ieeg.h5"
)

# what happens with scans.tsv file
Expand Down

0 comments on commit b2b421d

Please sign in to comment.