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

FIX: Do not generate desc-smoothAROMAnonaggr_bold conversions on standard spaces #1838

Merged
merged 1 commit into from Oct 18, 2019

Conversation

oesteban
Copy link
Member

This PR removes the connection of the template identifier (which is an iterable and is propagated as such by nipype's default behavior) to the space input of the data sink.

Following nipype's execution rules, the same input was copied over each time for each input at the template iterable. So, the same data were written over and over again with different space value. In other words, this PR does not address #1766. It just improves the clarity as only one conversion is generated.

Since desc-smoothAROMAnonaggr_bold is calculated always on MNI152NLin6Asym the keyword is not necessary anymore for disambiguation. I have concerns about whether removing it completely is a good idea (although BIDS-Derivatives mandated, I guess). WDYT?

@auto-comment
Copy link

auto-comment bot commented Oct 18, 2019

Thank your for raising your pull request.

Some of the fMRIPRep maintainers will review your changes as soon as time permits.
I'm attaching below a Review Checklist for the reviewers, to copy and paste
it in their review comment.

## PR Review

*Please check off boxes as applicable, and elaborate in comments below.  Your review is not limited to these topics, as described in the reviewer guide*

- [ ] As the reviewer I confirm that there are no conflicts of interest for me to review this work.

Please check what applies in the following aspects of the PR:

#### Code documentation

- [ ] New functions and modules are documented following the guidelines.
- [ ] Existing code required amendments in documentation and has been updated.
- [ ] Sufficient inline comments ensure readability by other contributors in the long term.

#### Documentation site

- [ ] The modifications to *fMRIPrep* in this PR **do not require extra documentation**. This is a common situation when a bug fix that does not change the code base substantially is submitted.
- [ ] This PR requires documentation. The corresponding documentation will be submitted as an additional PR in the future.
- [ ] This PR requires extra documentation, and will be included within this PR. Please check the boxes that apply best:
  - [ ] An existing feature is substantially modified, changing the interface and/or logic of a module.
  - [ ] A new feature is being added, therefore full documentation of it will be included
  - [ ] This PR addresses an error in existing documentation.
- [ ] Yes, all expected sections of documentation were generated by the CI build, and look as expected

#### Tests

- [ ] The new functionalities in this PR are covered by the existing tests
- [ ] New test batteries have been included with this PR

#### Data

- [ ] This PR does not require any additional data to be uploaded to OSF.
- [ ] This PR requires additional data for tests.

#### Dependencies: smriprep

- [ ] This PR does not require any update on `smriprep`; or
- [ ] `smriprep` has correctly been pinned.

#### Dependencies: niworkflows

- [ ] This PR does not require any update on `niworkflows`; or
- [ ] `niworkflows` has correctly been pinned.

#### Dependencies: sdcflows

- [ ] This PR does not require any update on `sdcflows`; or
- [ ] `sdcflows` has correctly been pinned.

#### Dependencies: Nipype

- [ ] This PR does not require any update on `nipype`; or
- [ ] `nipype` has correctly been pinned.

#### Dependencies: other

- [ ] This PR does not require any update on other dependencies; or
- [ ] other dependencies have correctly been pinned.

#### Reports generated within CI tests

- [ ] Yes, I have checked the reports of ds005 and they are not modified or the changes are as expected
- [ ] Yes, I have checked the reports of ds054 and they are not modified or the changes are as expected
- [ ] Yes, I have checked the reports of ds010 and they are not modified or the changes are as expected

### Review Comments (other than those left inline with the code)

@oesteban oesteban added this to the 1.5.1 milestone Oct 18, 2019
@oesteban oesteban requested a review from jdkent October 18, 2019 02:07
@oesteban oesteban added bug confounds derivatives effort: low Estimated low effort task impact: high Estimated high impact task labels Oct 18, 2019
@oesteban
Copy link
Member Author

Okay, the test is passing and there's no more space- keywords on the denoised files. I'm merging. If we want to bring the space key back to the name, it is as simple as setting it here:

https://github.com/oesteban/fmriprep/blob/ddbf63728b20099fc70d5fc3dd7abcda2a518d35/fmriprep/workflows/bold/outputs.py#L241

@oesteban oesteban merged commit 1ac6d3f into nipreps:master Oct 18, 2019
@oesteban oesteban deleted the fix/1816 branch October 18, 2019 03:30
@effigies
Copy link
Member

I think it's a good idea to restore space-. It feels like like a good reminder that will make it harder to make mistakes downstream.

oesteban added a commit to oesteban/fmriprep that referenced this pull request Oct 18, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug confounds derivatives effort: low Estimated low effort task impact: high Estimated high impact task
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants