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

Updating the bep009 with the latest master branch updates #576

Merged
merged 192 commits into from
Aug 19, 2020
Merged

Conversation

melanieganz
Copy link
Contributor

[MISC] I would just like to update the bep-009 branch that was made while ago with the latest updates from master before we add our actual changes and make a pull request.

tsalo and others added 30 commits May 16, 2020 12:42
=== Do not change lines below ===
{
 "chain": [],
 "cmd": "git-sedi suffices suffixes",
 "exit": 0,
 "extra_inputs": [],
 "inputs": [],
 "outputs": [],
 "pwd": "src/schema"
}
^^^ Do not change lines above ^^^
also added a stab for entity_table beginning -- just had to RF loading first
	(git)lena:~/proj/bids/bids-specification[ref/json-entity]git
	$> tools/bids-schema entity-table
	| Entity                                                                                         | Subject       | Session       | Task           | Acquisition   | Contrast Enhancing Agent   | Reconstruction   | Phase-Encoding Direction   | Run           | Corresponding Modality   | Echo           | Recording           | Processed (on device)   | Space           |
	|------------------------------------------------------------------------------------------------|---------------|---------------|----------------|---------------|----------------------------|------------------|----------------------------|---------------|--------------------------|----------------|---------------------|-------------------------|-----------------|
	| Format                                                                                         | `sub-<label>` | `ses-<label>` | `task-<label>` | `acq-<label>` | `ce-<label>`               | `rec-<label>`    | `dir-<label>`              | `run-<index>` | `mod-<label>`            | `echo-<index>` | `recording-<label>` | `proc-<label>`          | `space-<label>` |
	| anat<br>(T1w T2w T1rho T1map T2map T2star FLAIR FLASH PD PDmap PDT2 inplaneT1 inplaneT2 angio) | REQUIRED      | OPTIONAL      |                | OPTIONAL      | OPTIONAL                   | OPTIONAL         |                            |               |                          |                |                     |                         |                 |
	| anat<br>(defacemask)                                                                           | REQUIRED      | OPTIONAL      |                | OPTIONAL      | OPTIONAL                   | OPTIONAL         |                            |               | OPTIONAL                 |                |                     |                         |                 |
	| beh<br>(stim physio)                                                                           | REQUIRED      | OPTIONAL      | REQUIRED       |               |                            |                  |                            |               |                          |                |                     |                         |                 |
	| beh<br>(events beh)                                                                            | REQUIRED      | OPTIONAL      | REQUIRED       |               |                            |                  |                            |               |                          |                |                     |                         |                 |
	| dwi                                                                                            | REQUIRED      | OPTIONAL      |                | OPTIONAL      |                            |                  | OPTIONAL                   | OPTIONAL      |                          |                |                     |                         |                 |
	| dwi<br>(sbref)                                                                                 | REQUIRED      | OPTIONAL      |                | OPTIONAL      |                            |                  | OPTIONAL                   | OPTIONAL      |                          |                |                     |                         |                 |
	| eeg                                                                                            | REQUIRED      | OPTIONAL      | REQUIRED       | OPTIONAL      |                            |                  |                            | OPTIONAL      |                          |                |                     |                         |                 |
	| fmap<br>(phasediff phase1 phase2 magnitude1 magnitude2 magnitude fieldmap)                     | REQUIRED      | OPTIONAL      |                | OPTIONAL      |                            |                  |                            | OPTIONAL      |                          |                |                     |                         |                 |
	| fmap<br>(epi)                                                                                  | REQUIRED      | OPTIONAL      |                | OPTIONAL      | OPTIONAL                   |                  | REQUIRED                   | OPTIONAL      |                          |                |                     |                         |                 |
	| func<br>(bold cbv phase sbref)                                                                 | REQUIRED      | OPTIONAL      | REQUIRED       | OPTIONAL      | OPTIONAL                   | OPTIONAL         | OPTIONAL                   | OPTIONAL      |                          | OPTIONAL       |                     |                         |                 |
	| func<br>(events)                                                                               | REQUIRED      | OPTIONAL      | REQUIRED       | OPTIONAL      | OPTIONAL                   | OPTIONAL         | OPTIONAL                   | OPTIONAL      |                          | OPTIONAL       |                     |                         |                 |
	| func<br>(physio stim)                                                                          | REQUIRED      | OPTIONAL      | REQUIRED       | OPTIONAL      |                            | OPTIONAL         |                            | OPTIONAL      |                          |                | OPTIONAL            | OPTIONAL                |                 |
	| ieeg                                                                                           | REQUIRED      | OPTIONAL      | REQUIRED       | OPTIONAL      |                            |                  |                            | OPTIONAL      |                          |                |                     |                         |                 |
	| meg                                                                                            | REQUIRED      | OPTIONAL      | REQUIRED       | 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      |                          |                |                     |                         |                 |
	| electrodes<br>(eeg ieeg)                                                                       | REQUIRED      | OPTIONAL      |                | OPTIONAL      |                            |                  |                            |               |                          |                |                     |                         | OPTIONAL        |
	| events<br>(meg eeg ieeg)                                                                       | REQUIRED      | OPTIONAL      | REQUIRED       |               |                            |                  |                            | OPTIONAL      |                          |                |                     |                         |                 |
	| photo<br>(meg eeg ieeg)                                                                        | REQUIRED      | OPTIONAL      |                | OPTIONAL      |                            |                  |                            |               |                          |                |                     |                         |                 |
venvs -- virtualenvs I typically have around
.idea -- pycharm configuration
=== Do not change lines below ===
{
 "chain": [],
 "cmd": "tools/generate_entry_table",
 "exit": 0,
 "extra_inputs": [],
 "inputs": [],
 "outputs": [],
 "pwd": "."
}
^^^ Do not change lines above ^^^
One big change is that it merges rows within datatypes that have the
same entities.
This is primarily to make it easier to run things within Python, since
click-decorated functions can’t be called like Python functions.
* Fix typos in DECISION-MAKING file.

* Add self to contributors.

* Add utility contributions too.

* Revert contributors table spacing changes.
Co-authored-by: Chris Markiewicz <[email protected]>
@effigies
Copy link
Collaborator

I pushed master to bep-009. There were no changes, so it went in clean.

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.