Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Auto detect text files and perform LF normalization
* text=auto
12 changes: 12 additions & 0 deletions .github/workflows/moxunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,29 @@ jobs:
build:
runs-on: ubuntu-latest
steps:

- uses: actions/checkout@v2
with:
submodules: true
fetch-depth: 1

- name: Make jsonread for octave
run: |
sudo apt-get -y -qq update
sudo apt-get -y install octave
sudo apt-get -y install liboctave-dev
cd lib/JSONio
mkoctfile --mex jsonread.c jsmn.c -DJSMN_PARENT_LINKS
# cd ../..

- name: MOxUnit Action
uses: joergbrech/moxunit-action@v1.1
with:
tests: tests
src: src
with_coverage: true
cover_xml_file: coverage.xml

- name: Code coverage
uses: codecov/codecov-action@v1
with:
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,3 @@ node_modules/*
package-lock.json



2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ before_install:
- travis_retry sudo apt-get -y install nodejs
- travis_retry sudo apt-get -y install npm
# Install BIDS-Validator
- sudo npm install -g bids-validator@1.5.4
- sudo npm install -g bids-validator@1.5.6

install:
# make octave file the JSONio submodule
Expand Down
39 changes: 26 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,23 +101,31 @@ Here are the naming templates used.

- Behavior

`sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>]_events.tsv`
`sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>]_events.json`
`sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>]_beh.tsv`
`sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>]_beh.json`
```
sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>]_events.tsv
sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>]_events.json
sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>]_beh.tsv
sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>]_beh.json
```

- BOLD

`sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_ce-<label>][_dir-<label>][_rec-<label>][_run-<index>][_echo-<index>]_<contrast_label>.nii[.gz]`
```
sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_ce-<label>][_dir-<label>][_rec-<label>][_run-<index>][_echo-<index>]_<contrast_label>.nii[.gz]
```

- iEEG

`sub-<label>[_ses-<label>]_task-<task_label>[_run-<index>]_ieeg.json`
```
sub-<label>[_ses-<label>]_task-<task_label>[_run-<index>]_ieeg.json
```

- 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>[_run-<index>]_eeg.<manufacturer_specific_extension>
sub-<label>[_ses-<label>]_task-<label>[_run-<index>]_eeg.json
```

<!-- European data format (Each recording consisting of a .edf file)

Expand All @@ -136,14 +144,19 @@ Biosemi data format (Each recording consisting of a .bdf file) -->
current format `<matches>_recording-eyetracking_physio.tsv.gz`

future BEP format in a dedicated eyetracker folder
`sub-<participant_label>[_ses-<label>][_acq-<label>]_task-<task_label>_eyetrack.<manufacturer_specific_extension>`

```
sub-<participant_label>[_ses-<label>][_acq-<label>]_task-<task_label>_eyetrack.<manufacturer_specific_extension>
```

- Stim and physio

`<matches>[_recording-<label>]_physio.tsv.gz`
`<matches>[_recording-<label>]_physio.json`
`<matches>[_recording-<label>]_stim.tsv.gz`
`<matches>[_recording-<label>]_stim.json`
```
<matches>[_recording-<label>]_physio.tsv.gz
<matches>[_recording-<label>]_physio.json
<matches>[_recording-<label>]_stim.tsv.gz
<matches>[_recording-<label>]_stim.json
```

### Change log

Expand Down
55 changes: 0 additions & 55 deletions manualTests/test_createDataDictionary.m

This file was deleted.

9 changes: 8 additions & 1 deletion manualTests/test_makeRawDataset.m
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,14 @@ function test_makeRawDataset()
saveEventsFile('close', cfg, logFile);

% add dummy stim data
stimLogFile = saveEventsFile('open_stim', cfg, logFile);
stimLogFile.extraColumns.Speed.length = 1;
stimLogFile.extraColumns.LHL24.length = 3;
stimLogFile.extraColumns.is_Fixation.length = 1;

stimLogFile.SamplingFrequency = cfg.mri.repetitionTime;
stimLogFile.StartTime = 0;

stimLogFile = saveEventsFile('open_stim', cfg, stimLogFile);
for i = 1:100
stimLogFile(i, 1).onset = cfg.mri.repetitionTime * i;
stimLogFile(i, 1).trial_type = 'test';
Expand Down
Loading