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

Labelmerge #30

Merged
merged 16 commits into from
Dec 5, 2022
Merged

Labelmerge #30

merged 16 commits into from
Dec 5, 2022

Conversation

kaitj
Copy link
Collaborator

@kaitj kaitj commented Nov 22, 2022

Proposed changes

Update (Nov 30): Changed the base branch to dry-run as the tests were helpful to making sure that the changes don't break the workflow.

  • Updates zona_bb_subcortex.smk with rule for labelmerge
    • Adds container for labelmerge within the params, so that singularity run can be called. Otherwise snakemake just tries to run the rule using the container as a dependency.
  • Also adds / updates resource files necessary for workflow to run
    • Note, only MNI152NLin6Asym T1w template from templateflow is added. Can easily go between the 2 commonly used MNI spaces and this is sufficient for getting a transformation to subject space. In the future, we can look at requiring fmriprep / adding an fmriprep as suggested during the weekly meeting.

One note is that this PR assumes that khanlab/labelmerge#22 is good to proceed.

Types of changes

What types of changes does your code introduce? Put an x in the boxes that apply

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionalitiy)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Other (if none of the other choices apply)

Checklist

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you are unsure about any of the choices, don't hesitate to ask!

  • Changes have been tested to ensure that fix is effective or that a feature works.
  • Changes pass the unit tests
  • Code has been run through the poe quality task
  • I have included necessary documentation or comments (as necessary)
  • Any dependent changes have been merged and published

Notes

All PRs will undergo the unit testing before being reviewed. You may be requested to explain or make additional changes before the PR is accepted.

@kaitj kaitj mentioned this pull request Nov 22, 2022
9 tasks
@kaitj kaitj added the maintenance Updates or improvements that do not change functionality of the code label Nov 22, 2022
@kaitj kaitj changed the base branch from main to dry-run November 30, 2022 20:20
@kaitj kaitj marked this pull request as ready for review November 30, 2022 21:18
kaitj added 16 commits December 1, 2022 09:28
- Added tpl and updated names for MNI152NLin6Asym
- Renamed MNI2009b -> MNI152NLin2009bAsym
- Removed unnecessary files
- Update config
- Update config to include tsv for subcortical labels
- Update freesurfer tsv to match bids spec
- Update file name of Freesurfer dseg tsv
- Add inputs to rule all for copying freesurfer and zona tsv files to
appropriate location
- Still need to fix piping of workflow, update entities, and filenames
- Adds in rule for labelmerge (needs updating with container and proper
command)
- Update resources with correct names and paths
- Add tsv to rule all for copying from resource to bids folders for
labelmerge
- Simplify rule all
Copy link
Collaborator

@tkkuehn tkkuehn left a comment

Choose a reason for hiding this comment

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

Looks good, just wanna make sure the double check comment isn't blocking before I merge this.

@@ -140,6 +140,7 @@ rule dwi2response:

rule responsemean:
"""Compute average response function"""
# DOUBLE CHECK
Copy link
Collaborator

Choose a reason for hiding this comment

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

What are we double checking here?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Ahh, this was a note to my self, I removed it in one of the other PRs. Just wanted to check the conditional was written correctly by comparing with an existing rule written in another workflow.

@tkkuehn
Copy link
Collaborator

tkkuehn commented Dec 5, 2022

Tests are failing because the labelmerge branch doesn't have the test data. I'll merge this and make sure the tests complete on the dry-run branch.

@tkkuehn tkkuehn merged commit 144af01 into dry-run Dec 5, 2022
@tkkuehn tkkuehn deleted the labelmerge branch December 5, 2022 15:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
maintenance Updates or improvements that do not change functionality of the code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants