Skip to content

ENH: Enable antsRegistration 2.2.0+ masking #2078

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

Merged
merged 6 commits into from
Jun 20, 2017

Conversation

effigies
Copy link
Member

@effigies effigies commented Jun 15, 2017

Changes proposed in this pull request

  • Add fixed/moving_image_masks input spec entries, mutually exclusive with the singular versions
    • New entries are min_ver=2.2.0
    • Plural reflects that each mask can be set per-transform stage
  • Old entries set to max_ver=2.1.0; they produce different command-lines
  • AntsCommand is given a usable version property, based on running antsRegistration --version

Old PR text, for context.

Changes proposed in this pull request

  • Add missing import

Bug introduced in #2070.

@effigies
Copy link
Member Author

Turns out I failed to hook up these inputs, so the downstream testing I was doing was worthless. Added a doctest, which found another bug.

Ready for review.

@effigies
Copy link
Member Author

It turns out this is a post 2.1.0 development... Reverting #2070 and will update the input spec accordingly.

@effigies effigies force-pushed the fix/ants_reg_import branch from 72181cb to 90d1d35 Compare June 15, 2017 20:54
@codecov-io
Copy link

codecov-io commented Jun 15, 2017

Codecov Report

Merging #2078 into master will decrease coverage by 0.02%.
The diff coverage is 40.47%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2078      +/-   ##
==========================================
- Coverage   72.16%   72.13%   -0.03%     
==========================================
  Files        1138     1138              
  Lines       57229    57268      +39     
  Branches     8199     8206       +7     
==========================================
+ Hits        41301    41313      +12     
- Misses      14638    14663      +25     
- Partials     1290     1292       +2
Flag Coverage Δ
#smoketests 72.13% <40.47%> (-0.03%) ⬇️
#unittests 69.75% <40.47%> (-0.03%) ⬇️
Impacted Files Coverage Δ
...pe/interfaces/ants/tests/test_auto_Registration.py 85.71% <ø> (ø) ⬆️
nipype/interfaces/ants/base.py 51.72% <25.92%> (-23.28%) ⬇️
nipype/interfaces/ants/registration.py 74.21% <66.66%> (-0.45%) ⬇️
nipype/interfaces/base.py 83.8% <0%> (-0.19%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b9c75fb...b743f54. Read the comment docs.

@effigies effigies changed the title FIX: Missing import in ants.registration ENH: Enable antsRegistration 2.2.0+ masking Jun 16, 2017
@effigies
Copy link
Member Author

Status: I can run the desired command in ANTs 2.1.0 (though it crashes; it seems they changed how they did masking). I'm upgrading our setup to ANTs 2.2.0, so I'll be able to test it today.

@effigies
Copy link
Member Author

Status: I'm able to use this to pass a mask in ANTs 2.1.0; I'll test with 2.2.0 today.

@satra
Copy link
Member

satra commented Jun 16, 2017

@effigies - for nipype containers, we should move over to neurodebian install for ants to minimize footprint, now that the latest version is available there.

@effigies
Copy link
Member Author

@satra Done.

@satra satra merged commit 5040260 into nipy:master Jun 20, 2017
@effigies effigies deleted the fix/ants_reg_import branch June 20, 2017 15:39
effigies added a commit to effigies/niworkflows that referenced this pull request Jun 20, 2017
@satra satra added this to the 0.14.0 milestone Oct 20, 2017
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