Skip to content

FIX: Create out_reg_file correctly in RobustRegister #2205

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 5 commits into from
Oct 4, 2017

Conversation

effigies
Copy link
Member

@effigies effigies commented Oct 3, 2017

RobustRegister does not correctly return the full path to manually-specified out_reg_file names, and, if unspecified, creates them in the original folder.

Changes proposed in this pull request

  • Make out_reg_file a normal Either(True, File) trait, with default value True
  • out_reg_file is created in working directory by default

Also did some cleanup. See 5be5de9 for significant changes.

@effigies effigies force-pushed the fix/robust_register branch from 82b13de to 758251a Compare October 3, 2017 17:04
@codecov-io
Copy link

codecov-io commented Oct 3, 2017

Codecov Report

Merging #2205 into master will increase coverage by 0.02%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2205      +/-   ##
==========================================
+ Coverage   72.25%   72.28%   +0.02%     
==========================================
  Files        1177     1175       -2     
  Lines       58638    58770     +132     
  Branches     8447     8456       +9     
==========================================
+ Hits        42369    42481     +112     
- Misses      14902    14930      +28     
+ Partials     1367     1359       -8
Flag Coverage Δ
#smoketests 72.28% <100%> (+0.02%) ⬆️
#unittests 69.95% <100%> (+0.15%) ⬆️
Impacted Files Coverage Δ
...faces/freesurfer/tests/test_auto_RobustRegister.py 85.71% <ø> (ø) ⬆️
...ype/interfaces/freesurfer/tests/test_preprocess.py 89.74% <100%> (+0.13%) ⬆️
nipype/interfaces/freesurfer/preprocess.py 65.27% <100%> (+0.28%) ⬆️
nipype/pipeline/plugins/tests/test_multiproc.py 76.1% <0%> (-13.15%) ⬇️
nipype/pipeline/plugins/condor.py 14.7% <0%> (-2.44%) ⬇️
nipype/pipeline/plugins/pbs.py 17.14% <0%> (-2.31%) ⬇️
nipype/pipeline/plugins/lsf.py 14.86% <0%> (-2.25%) ⬇️
nipype/pipeline/plugins/slurm.py 14.66% <0%> (-2.22%) ⬇️
nipype/interfaces/spm/base.py 84.69% <0%> (-1.65%) ⬇️
nipype/pipeline/plugins/oar.py 29.06% <0%> (-1.62%) ⬇️
... and 34 more

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 6e95b3c...efaaaa2. Read the comment docs.

@effigies effigies force-pushed the fix/robust_register branch from f0885d1 to efaaaa2 Compare October 4, 2017 17:40
Copy link
Contributor

@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.

This all looks sensible. Happy to merge when tests pass.

@effigies
Copy link
Member Author

effigies commented Oct 4, 2017

I'll go ahead and merge, then.

@effigies effigies merged commit f3bb9e8 into nipy:master Oct 4, 2017
@effigies effigies deleted the fix/robust_register branch October 4, 2017 20:33
effigies added a commit to effigies/niworkflows that referenced this pull request Oct 4, 2017
effigies added a commit to effigies/niworkflows that referenced this pull request Oct 5, 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.

4 participants