Skip to content

Commit

Permalink
Merge pull request #677 from sappelhoff/optacq
Browse files Browse the repository at this point in the history 
[FIX] Add OPTIONAL acq entity to channels.tsv, events.tsv to match electrophysiological acquisitions
  • Loading branch information
@sappelhoff
sappelhoff authored Nov 30, 2020
2 parents 727ee87 + 181f5cb commit 72dc7d7
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 11 deletions.
6 changes: 3 additions & 3 deletions src/04-modality-specific-files/02-magnetoencephalography.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ Template:
sub-<label>/
[ses-<label>]/
meg/
sub-<label>[_ses-<label>]_task-<label>[_run-<index>][_proc-<label>]_meg.<manufacturer_specific_extension>
[sub-<label>[_ses-<label>]_task-<label>[_run-<index>][_proc-<label>]_meg.json]
sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>][_proc-<label>]_meg.<manufacturer_specific_extension>
[sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>][_proc-<label>]_meg.json]
```

Unprocessed MEG data MUST be stored in the native file format of the MEG
Expand Down Expand Up @@ -195,7 +195,7 @@ Template:
sub-<label>/
[ses-<label>]/
meg/
[sub-<label>[_ses-<label>]_task-<label>[_run-<index>][_proc-<label>]_channels.tsv]
[sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>][_proc-<label>]_channels.tsv]
```

This file is RECOMMENDED as it provides easily searchable information across
Expand Down
6 changes: 3 additions & 3 deletions src/04-modality-specific-files/03-electroencephalography.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ Template:
sub-<label>/
[ses-<label>]/
eeg/
sub-<label>[_ses-<label>]_task-<label>[_run-<index>]_eeg.<manufacturer_specific_extension>
sub-<label>[_ses-<label>]_task-<label>[_run-<index>]_eeg.json
sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>]_eeg.<manufacturer_specific_extension>
sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>]_eeg.json
```

The EEG community uses a variety of formats for storing raw data, and there is
Expand Down Expand Up @@ -197,7 +197,7 @@ Template:
sub-<label>/
[ses-<label>]/
eeg/
[sub-<label>[_ses-<label>]_task-<label>[_run-<index>]_channels.tsv]
[sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>]_channels.tsv]
```

This file is RECOMMENDED as it provides easily searchable information across
Expand Down
6 changes: 3 additions & 3 deletions src/04-modality-specific-files/04-intracranial-electroencephalography.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ Template:
sub-<label>/
[ses-<label>]/
ieeg/
sub-<label>[_ses-<label>]_task-<label>[_run-<index>]_ieeg.<manufacturer_specific_extension>
sub-<label>[_ses-<label>]_task-<label>[_run-<index>]_ieeg.json
sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>]_ieeg.<manufacturer_specific_extension>
sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>]_ieeg.json
```

The iEEG community uses a variety of formats for storing raw data, and there is
Expand Down Expand Up @@ -209,7 +209,7 @@ Template:
sub-<label>/
[ses-<label>]/
ieeg/
[sub-<label>[_ses-<label>]_task-<label>[_run-<index>]_channels.tsv]
[sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>]_channels.tsv]
```

A channel represents one time series recorded with the recording system (for
Expand Down
4 changes: 2 additions & 2 deletions src/99-appendices/04-entity-table.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ while entity definitions are in [Appendix IX](09-entities.md).
| meg<br>(meg) | REQUIRED | OPTIONAL | REQUIRED | OPTIONAL | OPTIONAL | OPTIONAL | | OPTIONAL |
| meg<br>(headshape) | REQUIRED | OPTIONAL | | OPTIONAL | | | OPTIONAL | |
| meg<br>(markers) | REQUIRED | OPTIONAL | OPTIONAL | OPTIONAL | | | OPTIONAL | |
| channels<br>(meg eeg ieeg) | REQUIRED | OPTIONAL | REQUIRED | | OPTIONAL | | | |
| channels<br>(meg eeg ieeg) | REQUIRED | OPTIONAL | REQUIRED | OPTIONAL | OPTIONAL | | | |
| electrodes<br>(eeg ieeg) | REQUIRED | OPTIONAL | | OPTIONAL | | | OPTIONAL | |
| events<br>(meg eeg ieeg) | REQUIRED | OPTIONAL | REQUIRED | | OPTIONAL | | | |
| events<br>(meg eeg ieeg) | REQUIRED | OPTIONAL | REQUIRED | OPTIONAL | OPTIONAL | | | |
| photo<br>(meg eeg ieeg) | REQUIRED | OPTIONAL | | OPTIONAL | | | | |

## Behavioral Data
Expand Down
1 change: 1 addition & 0 deletions src/schema/auxdatatypes/channels.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@
sub: required
ses: optional
task: required
acq: optional
run: optional
1 change: 1 addition & 0 deletions src/schema/auxdatatypes/events.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@
sub: required
ses: optional
task: required
acq: optional
run: optional

0 comments on commit 72dc7d7

Please sign in to comment.