Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge EEG examples onto master #149

Merged
merged 61 commits into from
Mar 11, 2019
Merged

Merge EEG examples onto master #149

merged 61 commits into from
Mar 11, 2019

Conversation

sappelhoff
Copy link
Member

@sappelhoff sappelhoff commented Mar 4, 2019

closes #132
closes bids-standard/bids-specification#107

This is rebasing the BEP006 branch and making some edits to the commits (i.e., squashing, or editing the messages). The content wise changes should be untouched ... this is just to allow for an easy "rebase and merge" of the BEP006_eeg branch onto Master as proposed in #95.

robertoostenveld and others added 30 commits March 4, 2019 17:51
use "name" and "description" for the columns containing A1 and Fp1 etc.
Data set (empty) from a single subject recording.
sappelhoff and others added 20 commits March 4, 2019 17:53
* rename ds000117 to eeg

* update sidecar eeg json

* typo fixes

* update to bids spec

* fix json formatting

* update matchingpennies example

* reformat hardware filter, remove simultaneous recording field

* add powerline freq to sleep

* fix filter obj
* software filter added

* added cuban dataset

* no cbdata
* software filter added

* added cuban dataset

* no cbdata

* cuban data added

* updated *scans.tsv

* added participants.json

* age in years
@sappelhoff sappelhoff changed the title Rebase BEP006 branch, getting ready for merge Merge EEG examples onto master Mar 4, 2019
@sappelhoff sappelhoff changed the base branch from bep006_eeg to master March 4, 2019 17:18
@sappelhoff sappelhoff added the EEG label Mar 4, 2019
@sappelhoff
Copy link
Member Author

@robertoostenveld @chrisfilo would you have time to review this PR?

@sappelhoff sappelhoff requested a review from chrisgorgo March 7, 2019 07:34
@chrisgorgo chrisgorgo merged commit a1a2ba6 into bids-standard:master Mar 11, 2019
sappelhoff pushed a commit that referenced this pull request May 12, 2019
Merge EEG examples onto master

Former-commit-id: a1a2ba6
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

BEP006 Merging Roadmap To Do for merging bep006 examples
4 participants