Merge master into bep006#76
Merged
robertoostenveld merged 34 commits intobids-standard:bep006_eegfrom Apr 25, 2018
Merged
Conversation
readme improvements
added missing participants file
added sub-08 to ds008/participants.tsv
…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
* 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
Update the validator to 0.26.0
Update ReferencesAndLinks for array of strings requirement.
Collaborator
Author
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 |
Merged
Collaborator
Author
|
Hi @chrisfilo, are you OK with me merging this? |
Contributor
|
Yes please go ahead (sorry swamped at work).
…On Wed, Apr 25, 2018, 3:05 AM Robert Oostenveld ***@***.***> wrote:
Hi @chrisfilo <https://github.com/chrisfilo>, are you OK with me merging
this?
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#76 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AAOkpy8_olqkAK_B54LMoOlbntQWw5FEks5tsEqDgaJpZM4TZkzR>
.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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.