Skip to content

Merge master into bep006#76

Merged
robertoostenveld merged 34 commits intobids-standard:bep006_eegfrom
robertoostenveld:merge_master_into_bep006
Apr 25, 2018
Merged

Merge master into bep006#76
robertoostenveld merged 34 commits intobids-standard:bep006_eegfrom
robertoostenveld:merge_master_into_bep006

Conversation

@robertoostenveld
Copy link
Copy Markdown
Collaborator

the master branch has moved on quite a bit. The consequence is that bep006_eeg is getting outdated and more difficult to maintain/update. This PR aims to synchronize the two again.

There are no changes other than the ones that have been merged into master.

suyashdb and others added 30 commits May 31, 2017 22:18
…and an incorrect first column containing event number (should be onset)

bids-validator returned First column of the events file must be named 'onset' (code: 20 - EVENTS_COLUMN_ONSET)
FIX - fixed events.tsv, which had an empty first header line element …
added pet_phno and hcp_example_bids directories
Multiecho bold example as per BIDS 1.0.2
 ENH: Copy physio data for DS210 from OpenFMRI
…dard#40" this

should be put back when PET BEP is merged

This reverts commit 61df79b.
* added example dataset with MEG+EEG+fMRI from https://github.com/jbwexler/ds000117_R1.0.0_empty

* included BrainStorm sample auditory dataset in BIDS-MEG format

* added example BIDS dataset from MNE

* corrected meg events onsets

* replaced empty cells w/ 'n/a' in tsv files

* updated channels.tsv files

* fixed bids-validator stimuli error

* updated publications in README

* renamed mef files to comply with BIDS

* deleted _trans.fif files

* changed proc-sss to proc-tsss in filenames

* replaced tsss logs and added new derivatives

* FIX - removed gsheet participants table, this addresses bids-standard#26

* added ds000117/task-facerecognition_proc-tsss_meg.json and softwarefilters

* moved _proc-tsss_meg.fif to derivatives

* fixed derivatives filenames

* added onset and duration columns to beh events

* added MEGCoordinatesUnits and LandmarkCoordinateUnits to _fid.json

* Fixes after running BIDS validator

* updated _fid.json files

* added .pos files

* added commas to sub-01_ses-meg_task-facerecognition_fid.json

* changed AnatomicalMRICoordinateSystem value to NIfTi

* made several changes to _meg.json files

* Fixes

* removed OnlineFilters from _meg.json

* DOC - added links to full datasets, see bids-standard#16

* update CHANGES and dataset_description.json

* updated brainstorm_sample_auditory to the latest version from the google drive, as discussed in bids-standard#38

* passed the json files through https://jsonlint.com to check (all OK) and to format them in a human readable way

* updated EpochLength from null to 0

* renamed the brainstorm_sample_auditory and mne_sample_data to be consistent with their representation on openfmri.org, see bids-standard#38

* added ds000247, modified ds000246

* fid.json --> coordsystem.json

fid.json --> coordsystem.json

* *_coordsystem.json are session specific

* Coodsystem, Headshape, Photo, don't need to include *_task-label in the name

Coodsystem, Headshape and Photo, files don't need to include *_task-label in the name. They are session specific

* Remove MRI coordinates

* Head coils.

* update ds00246 and ds00247

* channels.tsv replace 0 by n/a

* remove anatomical coordinates

* HeadCoildFrequency

* update ds000117 from Rik

* updating

* ENH simpler bidsignore

* FIX ds000248 issue with maxfilter

* fix ds000248

* replace Neuromag/Elekta by Elekta/Neuromag

* Remove derivatives folder
@robertoostenveld
Copy link
Copy Markdown
Collaborator Author

I think that quite some of the changes in @CPernet pull request #66 actually relate to this.

@robertoostenveld
Copy link
Copy Markdown
Collaborator Author

Hmm, I don't know how to deal with the failing test. I totally agree that some datasets in the bep006_eeg branch are not yet BIDS compliant, but I do think that merging this PR would be the best to move forward. This PR is not meant to deal with the EMBLA and rikesh datasets

@robertoostenveld
Copy link
Copy Markdown
Collaborator Author

Hi @chrisfilo, are you OK with me merging this?

@chrisgorgo
Copy link
Copy Markdown
Contributor

chrisgorgo commented Apr 25, 2018 via email

@robertoostenveld robertoostenveld merged commit 092937e into bids-standard:bep006_eeg Apr 25, 2018
@robertoostenveld robertoostenveld deleted the merge_master_into_bep006 branch April 25, 2018 14:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants