Skip to content

create_featreg_preproc: reference run modification #2190

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 4 commits into from
Sep 24, 2017
Merged

create_featreg_preproc: reference run modification #2190

merged 4 commits into from
Sep 24, 2017

Conversation

oliver-contier
Copy link
Contributor

ENH

Added possibility to specify which functional run the reference volume should be picked from to the function 'create_featreg_preproc'. The reference run can be selected by integer indexing or with a string ('first', 'middle', 'last') similar to how the reference volume is selected. Also added simple test functions respectively.

We ran an analysis with these changes on nipype version 0.11.0 and it worked fine.

@codecov-io
Copy link

codecov-io commented Sep 19, 2017

Codecov Report

Merging #2190 into master will increase coverage by 0.02%.
The diff coverage is 86.66%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2190      +/-   ##
==========================================
+ Coverage   72.28%   72.31%   +0.02%     
==========================================
  Files        1171     1172       +1     
  Lines       58622    58646      +24     
  Branches     8433     8436       +3     
==========================================
+ Hits        42377    42407      +30     
+ Misses      14887    14884       -3     
+ Partials     1358     1355       -3
Flag Coverage Δ
#smoketests 72.31% <86.66%> (+0.02%) ⬆️
#unittests 69.98% <86.66%> (+0.02%) ⬆️
Impacted Files Coverage Δ
nipype/workflows/fmri/fsl/tests/test_preprocess.py 100% <100%> (ø)
nipype/workflows/fmri/fsl/preprocess.py 87.15% <73.33%> (-0.82%) ⬇️
nipype/interfaces/base.py 82.94% <0%> (-0.37%) ⬇️
nipype/pipeline/engine/workflows.py 78.75% <0%> (+2.36%) ⬆️

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 4a0bd3d...5f15479. Read the comment docs.

@codecov-io
Copy link

codecov-io commented Sep 19, 2017

Codecov Report

Merging #2190 into master will increase coverage by 0.02%.
The diff coverage is 83.87%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2190      +/-   ##
==========================================
+ Coverage   72.28%   72.31%   +0.02%     
==========================================
  Files        1171     1172       +1     
  Lines       58622    58647      +25     
  Branches     8433     8437       +4     
==========================================
+ Hits        42377    42411      +34     
+ Misses      14887    14881       -6     
+ Partials     1358     1355       -3
Flag Coverage Δ
#smoketests 72.31% <83.87%> (+0.02%) ⬆️
#unittests 69.98% <83.87%> (+0.02%) ⬆️
Impacted Files Coverage Δ
nipype/workflows/fmri/fsl/tests/test_preprocess.py 100% <100%> (ø)
nipype/workflows/fmri/fsl/preprocess.py 86.9% <68.75%> (-1.06%) ⬇️
nipype/pipeline/engine/workflows.py 78.75% <0%> (+2.36%) ⬆️

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 4a0bd3d...64fe757. Read the comment docs.

else:
return files[filemap[whichrun]]

if isinstance(files, list):
Copy link
Member

Choose a reason for hiding this comment

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

perhaps this if clause should be at the beginning to account for the potential that files is not a list, but a single filename.

@oliver-contier
Copy link
Contributor Author

Thanks for the remark, changes coming up

@oliver-contier
Copy link
Contributor Author

Should now also work in case a single file (i.e. functional run) is given.

@satra satra merged commit 43b2406 into nipy:master Sep 24, 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