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

Revision of dMRI artifact correction workflows #903

Merged
merged 41 commits into from
Sep 29, 2014

Conversation

oesteban
Copy link
Contributor

A lot of revisions under this PR. It'd be interesting to have it included into the next release.

@oesteban
Copy link
Contributor Author

I'm submitting this PR just in case I reach the deadline of the next release (please do not merge yet), still a lot of work going on. Also tests need be revised.

When merged the new dipy interfaces I've written, this example should
be updated adding a denoising node.
* ApplyTopup is now called with correct arguments when the reversed
  encoding image is only one b0
* Added documentation
* Deprecated old workflows in nipype.workflows.dmri.fsl (added warnings in
  both documentation and code)
* Updated CHANGES
Uses TOPUP and Eddy for correction. Tested on the new dmri_preprocess.py
example with the fsl course data.
@oesteban
Copy link
Contributor Author

oesteban commented Sep 2, 2014

I think this is enough for release, so I remove the WIP tag from the title.
The example currently depends on #911, that needs be merged before.

I also want to include denoising from dipy in the example, so I will wait until #910 is merged as well.

@oesteban oesteban changed the title WIP: Revision of dMRI artifact correction workflows Revision of dMRI artifact correction workflows Sep 2, 2014
@coveralls
Copy link

Coverage Status

Changes Unknown when pulling 55457a2 on oesteban:enh/NewEPIArtifactCorrections into * on nipy:master*.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.02%) when pulling dfa8346 on oesteban:enh/NewEPIArtifactCorrections into 7f35086 on nipy:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.02%) when pulling eedcfcc on oesteban:enh/NewEPIArtifactCorrections into 7f35086 on nipy:master.

@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling 32577f2 on oesteban:enh/NewEPIArtifactCorrections into 785f6dd on nipy:master.

@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling b76c0e5 on oesteban:enh/NewEPIArtifactCorrections into 3331825 on nipy:master.

@oesteban
Copy link
Contributor Author

oesteban commented Sep 5, 2014

@satra, @chrisfilo I need two text files to be passed as arguments to FLIRT. I added them under worflows/data and created an __init__.py with a function to return them (oesteban@2fa95f0). Is this correct? If not, how should I include hard-coded static files?

Other than this, I think these new workflows are ready to be merged. There is one new example based on the FSL course data that works correctly. I'm testing the remaining workflows. There are some stuff to refine (e.g. these two files, I opened a thread in the FSL forum trying to improve them).

I will see how to write some real tests (as oppposed to doctests) using the fsl course data like those for bedpostx.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.0%) when pulling 2fa95f0 on oesteban:enh/NewEPIArtifactCorrections into 3331825 on nipy:master.

@chrisgorgo
Copy link
Member

This looks good to me. The only problem I have is the new naming convention you are proposing. I am leaning towards your approach - grouping workflows by modality rather than software packages. We need to be consistent though. Maybe it would be better to keep the old nomenclature in this PR and start a discussion/new PR about new convention?

@oesteban
Copy link
Contributor Author

oesteban commented Sep 5, 2014

Ok, no problem on removing the headers, they are automatically added by my editor.

Regarding the nomenclature, you mean I should move this code under fsl? No problem about that, I understand we first need to agree on the new nomenclature.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.01%) when pulling 5f7feb6 on oesteban:enh/NewEPIArtifactCorrections into 3331825 on nipy:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.01%) when pulling 36a7f05 on oesteban:enh/NewEPIArtifactCorrections into 3331825 on nipy:master.

@oesteban
Copy link
Contributor Author

oesteban commented Sep 6, 2014

@chrisfilo :

  • Signatures removed everywhere they were present
  • Code moved back to fsl folder under workflows

@coveralls
Copy link

Coverage Status

Coverage increased (+0.02%) when pulling a166a76 on oesteban:enh/NewEPIArtifactCorrections into 3331825 on nipy:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.01%) when pulling 541b6aa on oesteban:enh/NewEPIArtifactCorrections into 3331825 on nipy:master.

@chrisgorgo chrisgorgo merged commit 541b6aa into nipy:master Sep 29, 2014
@oesteban oesteban deleted the enh/NewEPIArtifactCorrections branch October 16, 2014 14:50
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