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

♻️ Refactor atlas ingress #1885

Draft
wants to merge 24 commits into
base: develop
Choose a base branch
from
Draft

♻️ Refactor atlas ingress #1885

wants to merge 24 commits into from

Conversation

shnizzedy
Copy link
Member

@shnizzedy shnizzedy commented Feb 24, 2023

Related to

Related to #1874 by @shnizzedy

Description

Simplifies ROI atlas ingress logic in C-PAC graph

before after
roi_mask_dataflow_before roi_mask_dataflow_after

Technical details

For a given ROI atlas, there are 6 possible places it could be used in C-PAC:

---
v1.8.5
---
erDiagram
    TSE-Avg o|--o{ TSE-Avg-atlas : gather
    TSE-Avg-atlas ||--|| TSE-Avg-analysis : analyze
    TSE-Avg-analysis ||--|| TSE-Avg-result : resample
    TSE-Voxel o|--o{ TSE-Voxel-atlas : gather
    TSE-Voxel-atlas ||--|| TSE-Voxel-analysis : analyze
    TSE-Voxel-analysis ||--|| TSE-Voxel-result : resample
    TSE-SpatialReg o|--o{ TSE-SpatialReg-atlas : gather
    TSE-SpatialReg-atlas ||--|| TSE-SpatialReg-analysis : analyze
    TSE-SpatialReg-analysis ||--|| TSE-SpatialReg-result : resample
    SCA-Avg o|--o{ SCA-Avg-atlas : gather
    SCA-Avg-atlas ||--|| SCA-Avg-analysis : analyze
    SCA-Avg-analysis ||--|| SCA-Avg-result : resample
    SCA-DualReg o|--o{ SCA-DualReg-atlas : gather
    SCA-DualReg-atlas ||--|| SCA-DualReg-analysis : analyze
    SCA-DualReg-analysis ||--|| SCA-DualReg-result : resample
    SCA-MultReg o|--o{ SCA-MultReg-atlas : gather
    SCA-MultReg-atlas ||--|| SCA-MultReg-analysis : analyze
    SCA-MultReg-analysis ||--|| SCA-MultReg-result : resample
Loading

This PR moves the gathering and resampling to early in the pipeline, so each atlas is gathered and resampled once, at the beginning of the pipeline, and the analyses don't get done at an unnecessarily high resolution.

---
FCP-INDI/C-PAC#1885
---
erDiagram
   atlas }o--o| TSE-Avg : gather-and-resample
   atlas }o--o| TSE-Voxel : gather-and-resample
   atlas }o--o| TSE-SpatialReg : gather-and-resample
   atlas }o--o| SCA-Avg : gather-and-resample
   atlas }o--o| SCA-DualReg : gather-and-resample
   atlas }o--o| SCA-MultReg : gather-and-resample
   TSE-Avg ||--|| TSE-Avg-result : analyze
   TSE-Voxel ||--|| TSE-Voxel-result : analyze
   TSE-SpatialReg ||--|| TSE-SpatialReg-result : analyze
   SCA-Avg ||--|| SCA-Avg-result : analyze
   SCA-DualReg ||--|| SCA-DualReg-result : analyze
   SCA-MultReg ||--|| SCA-MultReg-result : analyze
Loading

Tests

Screenshots

Checklist

  • My pull request has a descriptive title (not a vague title like Update index.md).
  • My pull request targets the develop-1.8.6 branch of the repository.
  • My commit messages follow best practices.
  • My code follows the established code style of the repository.
  • I added tests for the changes I made (if applicable).
  • I updated the changelog.
  • I added or updated documentation (if applicable).
  • I tried running the project locally and verified that there are no visible errors.

Developer Certificate of Origin

Developer Certificate of Origin
Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.


Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.

@shnizzedy shnizzedy added this to the 1.8.6 release milestone Feb 24, 2023
@shnizzedy
Copy link
Member Author

Current status: only getting one atlas per analysis method, need to fix that fork point

@nx10 nx10 changed the base branch from develop-1.8.6 to develop June 1, 2023 18:07
@shnizzedy shnizzedy removed this from the 1.8.6 release milestone Oct 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: 🔖 Ready/Next
Development

Successfully merging this pull request may close these issues.

1 participant