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

rodentQC #969

Merged
merged 31 commits into from
Mar 28, 2022
Merged

rodentQC #969

merged 31 commits into from
Mar 28, 2022

Conversation

eilidhmacnicol
Copy link
Collaborator

@eilidhmacnicol eilidhmacnicol commented Feb 25, 2022

This PR puts in place the foundation to extend MRIQC to other populations, including rodents.

Still to do:

  • Improve segmentation
  • Test alternative EPI masking methods
  • Finalise Initial head mask parameters for rats
  • Improving the reportlets for rodent FOVs (although maybe this requires some more work from the niworkflows end) -> moving to NiWorkflows
  • Add a test for rats (WDYT?) -> will open a separate issue for this

For future, it might be worth establishing a dictionary or a set of JSON files that set template choices for each species available in TemplateFlow.

NB: I tried to push to this as a feature branch, rather than straight to master, but I didn't have the credentials.

@pep8speaks
Copy link

pep8speaks commented Feb 25, 2022

Hello @eilidhmacnicol, Thank you for updating!

Cheers! There are no style issues detected in this Pull Request. 🍻 To test for issues locally, pip install flake8 and then run flake8 niworkflows.

Comment last updated at 2022-03-25 14:56:36 UTC

Copy link
Member

@oesteban oesteban left a comment

Choose a reason for hiding this comment

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

Looks awesome - thanks for this!

mriqc/cli/parser.py Outdated Show resolved Hide resolved
@oesteban
Copy link
Member

Hey @eilidhmacnicol, I've just cut 22.0.0rc1 and rebased this branch to current master. This is to say, I'm happy to help here and do whatever you need to get this to the finish line.

It feels that the better segmentation, the tests, and the better parameters of the head mask can/should be addressed in separate PRs. The improvements to the reportlets pertain to niworkflows/nirodents.

@eilidhmacnicol
Copy link
Collaborator Author

Hi @oesteban - I've added the option for Atropos segmentation, and it's looking much better now.

I agree that segmentation and headmasking can be improved in later commits when we encounter further test data. Marking as ready to merge now.

@eilidhmacnicol eilidhmacnicol marked this pull request as ready for review March 15, 2022 09:18
@oesteban
Copy link
Member

One more for style -- can you run

black mriqc/

?

@eilidhmacnicol
Copy link
Collaborator Author

@oesteban - tests are looking good, but I've just realised an issue: I see the NiWorkflows version has been pinned, but NiRodents and artsBrainExtraction currently uses a feature branch of NiWorkflows so this will need to be updated for a Docker image.

@oesteban
Copy link
Member

We will need to finalize spitting out the brain extraction from niworkflows in order to be able to use the new package :(

The alternative is too dirty for an official MRIQC release.

@eilidhmacnicol eilidhmacnicol force-pushed the feat/rodentQC branch 3 times, most recently from cd59001 to 1fa3b1c Compare March 17, 2022 13:05
@eilidhmacnicol
Copy link
Collaborator Author

eilidhmacnicol commented Mar 17, 2022

Okay - some very good news. The NiWorkflows pin issue was (thankfully) a false alarm. I ran an image built on mriqc 22.0.0rc1 with the necessary changes from here and nipreps/nirodents#55 built on top and it ran with no issues.

At this stage, the blockers for this PR's merge are:

related to NiRodents

related to DiPy

@eilidhmacnicol
Copy link
Collaborator Author

I think the tests failing are unrelated to the changes made here and might be beyond the scope of this PR. WDYT @oesteban? Is it time to merge?

@oesteban
Copy link
Member

I think the tests failing are unrelated to the changes made here and might be beyond the scope of this PR. WDYT @oesteban? Is it time to merge?

You are going to break master, but considering the type of error it is fair to say that the problem is beyond the scope of this PR. So go ahead and merge.

The reason why this is failing is that we probably need to pin jinja2 with some upper bound version. We should do that quickly after your PR so that dependency errors don't start snowballing.

@oesteban
Copy link
Member

Actually, you can't merge, I believe. I'm giving you permissions right now - please merge yourself (I believe one should merge their own PRs whenever that is possible/allowed).

@eilidhmacnicol eilidhmacnicol merged commit 968e118 into nipreps:master Mar 28, 2022
@welcome
Copy link

welcome bot commented Mar 28, 2022

Thanks for opening this pull request and congratulations for taking it to the finish line! It looks like this is your first time contributing to MRIQC. 😄
We invite you to list yourself as an MRIQC contributor. To learn more about what that entails and how we credit our contributors, please check out the contributing guidelines. If your name is not already on the list, please insert it, in alphabetical order of (i) lastname and (ii) firstname, into the .maint/CONTRIBUTORS.md file.
Of course, if you want to opt-out this time, there is no problem at all with adding your name later. You will be always welcome to add it in the future whenever you feel it should be listed.

@eilidhmacnicol eilidhmacnicol deleted the feat/rodentQC branch March 28, 2022 11:02
@eilidhmacnicol eilidhmacnicol mentioned this pull request Mar 28, 2022
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.

3 participants