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

[ENH] Bep 005: Arterial Spin Labeling #669

Merged
merged 88 commits into from
Jan 15, 2021
Merged

[ENH] Bep 005: Arterial Spin Labeling #669

merged 88 commits into from
Jan 15, 2021

Conversation

sappelhoff
Copy link
Member

@sappelhoff sappelhoff commented Nov 11, 2020

@sappelhoff sappelhoff added the BEP label Nov 18, 2020
@patsycle
Copy link
Collaborator

@sappelhoff Hi Stefan, I guess the checks are unsuccessfull now due to the links added in the description of EchoTime and FlipAngle. IS that correct?

@sappelhoff
Copy link
Member Author

Hi Stefan, I guess the checks are unsuccessfull now due to the links added in the description of EchoTime and FlipAngle. IS that correct?

that is correct, however one broken link can already be fixed: ./99-appendices/09-entities.md --> look at the ./ with that you say: look at the 99-appendices directory in the current directory, and find the 09-entities.md file.

However, you have to take into account from where you are linking to ./99-appendices/09-entities.md

--> you are doing that from the 04-modality-specific-files folder. ... and in that folder, there is no 99-appendices folder.

So you need to do ../99-appendices/09-entities.md, because ../ means: "look in the directory above the current one".

And there you'll find 99-appendices

@sappelhoff
Copy link
Member Author

@patsycle you can temporarily edit this line:

fail_on_warning: true

so that it says

 fail_on_warning: false

that way, the draft will continue to be built. Then once your missing "link" is available, we change that back to "true".

Also edit this line in the other file and remove the --strict

command: mkdocs build --clean --strict --verbose

HenkMutsaerts and others added 12 commits November 30, 2020 10:59

Co-authored-by: Patricia Clement <41481345+patsycle@users.noreply.github.com>
Co-authored-by: Stefan Appelhoff <stefan.appelhoff@mailbox.org>
Co-authored-by: Chris Markiewicz <effigies@gmail.com>
Co-authored-by: Julia Guiomar Niso Galán <guiomar.niso@ctb.upm.es>
Co-authored-by: Remi Gau <remi_gau@hotmail.com>
Removed:
all ancillary scaling factors should be taken into account in the conversion to BIDS, which is why BIDS does not provide a separate scaling factor field other than the NIfTI header.
added in the common - sequence specifics table
Reason: for ASL, defining 2D and 3D is required. This used to be added in the PulseSequenceType field, but this should stay a free text field. Therefore, the MRAcquisitionType field is added (based on DicomTag).
The 2D/3D information needed for ASL, is now moved to the new MRAcquisitionType field.
based on comment of Stefan Appelhof, the need for a single column was added in the introductory text for aslcontext.tsv, before the 3 cases.
@tsalo
Copy link
Member

tsalo commented Jan 5, 2021

Per today's maintainers call, I think this PR is stable enough that we can start working on the schema components. I think I will open a PR directly to bep-005 that the BEP group can review. Does that sound good?

@effigies
Copy link
Collaborator

effigies commented Jan 5, 2021

I think I will open a PR directly to bep-005 that the BEP group can review.

That would have been my suggestion.

@tsalo tsalo mentioned this pull request Jan 5, 2021
patsycle and others added 3 commits January 9, 2021 14:17
* Add ASL to schema files and regenerate entity table.

* Fix style issue.

* Add fmap-format m0scan to schema.
Added 'Referring to the M0 of blood'
Added additional information for LabelingDuration
@effigies
Copy link
Collaborator

@patsycle @HenkMutsaerts I just merged the final BEP-001 PR. That's causing some merge conflicts. I'm happy to resolve them unless you would prefer to do it.

@effigies effigies mentioned this pull request Jan 13, 2021
@HenkMutsaerts
Copy link
Collaborator

@patsycle @HenkMutsaerts I just merged the final BEP-001 PR. That's causing some merge conflicts. I'm happy to resolve them unless you would prefer to do it.

The conflicts look easy resolvable, I don't mind who does it :) I'm working on making ExploreASL read ASL-BIDS, in combination with bids-matlab, then we can really process all our BIDS ASL examples, which I like as a final test before merging bep005, should be done hopefully around this weekend.

@sappelhoff
Copy link
Member Author

@HenkMutsaerts @patsycle we can also merge this PR (after @effigies resolved conflicts, thanks for offering), and wait with the release for a few days.

  • that would give you the chance to test everything for a few more days
  • if during these days (before the release) you notice some things that need to be remedied, you can make a small edit PR

The big benefit would be that we get this huge PR merged in, and that other PRs can continue more easily without being concerned about merge conflicts being introduced here and there.

I don't see a drawback to that approach, does anyone object?

@patsycle
Copy link
Collaborator

@sappelhoff Before doing that, we were thinking about changing one final thing (e.g. *_labeling.jpg to *_asllabeling.jpg, for consistency with the naming of aslcontext.tsv). I will do that today. But, how do I change this for the schemas, or could @tsalo help me out with this?

@HenkMutsaerts
Copy link
Collaborator

@HenkMutsaerts @patsycle we can also merge this PR (after @effigies resolved conflicts, thanks for offering), and wait with the release for a few days.

  • that would give you the chance to test everything for a few more days
  • if during these days (before the release) you notice some things that need to be remedied, you can make a small edit PR

The big benefit would be that we get this huge PR merged in, and that other PRs can continue more easily without being concerned about merge conflicts being introduced here and there.

I don't see a drawback to that approach, does anyone object?

No, this seems a good idea!

@effigies
Copy link
Collaborator

Conflicts resolved and appendix renumbered, since qMRI got XI. Please review the changes to be sure I didn't accidentally revert something I shouldn't have.

@patsycle
Copy link
Collaborator

@effigies It all looks good, couldn't find any errors. @sappelhoff Linkchecker is failing though..

@sappelhoff sappelhoff merged commit d794736 into master Jan 15, 2021
@sappelhoff
Copy link
Member Author

@patsycle I re-ran the linkchecker and it passed the second time. That issue was only temporary.

Now the BEP is merged 🎉 thanks to the team and the reviewers! Now - as suggested - you can make some final checks together with @HenkMutsaerts and his pipeline ... and if everything is fine, we can release soon, because BEP001 has also been merged.

That'll be a big celebration with BEP001 and BEP005 in for BIDS 1.5 :-)

@sappelhoff
Copy link
Member Author

PS: Very sorry to merge this so early in the morning ... The champagne from the fridge would taste much better in the evening 😄

@patsycle
Copy link
Collaborator

PS: Very sorry to merge this so early in the morning ... The champagne from the fridge would taste much better in the evening 😄

@sappelhoff No worries, it is already noon here. Perfect timing to open a bottle ;)

Comment on lines +18 to +22
- suffixes:
- aslcontext
extensions:
- .tsv
- .json
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

only tsv should be allowed

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.

New milestone: BIDS Extension Proposal 005: ASL
7 participants