-
Notifications
You must be signed in to change notification settings - Fork 300
FIX: Repair search for precomputed transforms #3369
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
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
Conversation
Thanks for opening this pull request! It looks like this is your first time contributing to fMRIPrep. 😄 |
daa7d49
to
69695ff
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #3369 +/- ##
==========================================
+ Coverage 71.03% 71.59% +0.55%
==========================================
Files 56 57 +1
Lines 4233 4249 +16
Branches 638 639 +1
==========================================
+ Hits 3007 3042 +35
+ Misses 1114 1091 -23
- Partials 112 116 +4 ☔ View full report in Codecov by Sentry. |
f935685
to
bd290fc
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some comments on the test:
Avoid possible bugs in `io_spec.json` during test Co-authored-by: Chris Markiewicz <effigies@gmail.com>
Simplify assertion in test for loaded transforms Co-authored-by: Chris Markiewicz <effigies@gmail.com>
…eparing to call collect_derivatives Co-authored-by: Chris Markiewicz <effigies@gmail.com>
Co-authored-by: Chris Markiewicz <effigies@gmail.com>
For remaining issues, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. Would you mind writing a similar test for the boldref
volumes? Can be in this PR or separate. I think we'll need to flip the direction of the q/entities
again.
👍🏻 #3370 |
24.1.1 (October 10, 2024) Bug fix release in the 24.1.x series. Precomputed functional derivatives were not being correcly detected, and a couple fixes for rare issues. * FIX: Remove checks for unit zooms and symmetric rotations in template warp (#3376) * FIX: Stop excluding FS minc_modify_header used during fallback registration (#3372) * FIX: Repair search for precomputed bold references (#3370) * FIX: Repair search for precomputed transforms (#3369)
* Update fMRIPrep version. * Update linting rules. * Run ruff --fix. * Fix some style issues. * Fix remaining ruff issues. * Update more stuff. * Update test_cli.py * Run ruff format. * Fix stuff. * Keep bringing it up to date. * Fix things up some more. * Keep working. * Update config.py * Fix. * Update base.py * Update bids.py * Update. * Update run.py * Use init_bold_fsLR_resampling_wf from fMRIPrep. * Fix generate_reports calls. * Don't try to invert. * Use internal copy of generate_reports. * Add `--aggregate-session-reports`. * Update report specs. * Update asl.py * Fix a couple of things. * Update io_spec.json * Reproduce nipreps/fmriprep#3369.
25.0.0 (March 25, 2025) New feature release in the 25.0.x series. This release substantially improves support for pre-computed derivatives. Previous releases would miss some derivatives and rerun the computations. Note that derivatives from previous versions will be accepted, so it should not be necessary to recompute derivatives from previous versions. The recommended command line is:: fmriprep BIDS_DIR OUT_DIR participant --derivatives fmriprep=PRECOMP_DIR Note that multiple derivatives can be specified, for example:: fmriprep BIDS_DIR OUT_DIR participant \ anat=PRECOMPUTED_ANATOMICAL_DIR \ func=PRECOMPUTED_FUNCTIONAL_DIR When the same file is found in multiple derivatives, the last one found takes precedence. Additionally, `--force-*` flags have been consolidated into a single `--force` flag that can take multiple, space-separated arguments. Structural processing changes ----------------------------- We now output white, pial and midthickness fsLR meshes on the subject surface. Look for `sub-<subject>_hemi-<L|R>_space-fsLR_*_<surf>.surf.gii` files. Brain extraction has been modified slightly to more closely match the `antsBrainExtraction.sh` workflow distributed by ANTs. The impact should be minimal, but in rare cases this fixes a crash. Fieldmap processing changes --------------------------- SyN-SDC fieldmap filtering is now single-level, following the improvements for gradient-echo fieldmaps in 24.1. Jacobian-weighting during fieldmap unwarping is now on by default *only* for PEPolar fieldmaps. To enable for other fieldmap types, use `--force fieldmap-jacobian`. All merged pull requests ------------------------ * FIX: Detect and apply precomputed fieldmaps (#3439) * FIX: Calculate bold mask and dummy scans in transform-only runs (#3428) * FIX: Use consistent skull-stripping pre- and post- SDC (#3415) * FIX: Use removeprefix instead of lstrip or ternary operator (#3409) * FIX: Listify sessions when generating reports (#3408) * FIX: Ensure fieldmap is resampled correctly in report (#3387) * FIX: Stop excluding FS minc_modify_header used during fallback registration (#3372) * FIX: Repair and test query for precalculated baseline/boldref files (#3370) * FIX: Repair search for precomputed transforms (#3369) * ENH: Enable Jacobians only for PEPOLAR by default, allow forcing (#3443) * ENH: Create `--force` flag that accepts a list, replacing individual `--force-*` flags (#3442) * ENH: Output fsLR meshes on subject surfaces (#3411) * ENH: Flexibilize "sophisticated" pepolar to allow monomodal execution (#3393) * ENH: Update FSL packages for reported bug fixes (#3374) * RF: Calculate RMSD from motion transforms (#3427) * RF: Reconstruct motion confounds from minimal derivatives (#3424) * RF: Replace deprecated pkgutil.find_loader (#3384) * RF: Upgrade nitransforms and remove workarounds (#3378) * DOC: Fix xfm extension in the outputs docs (#3435) * DOC: Mention fMRIPost-AROMA in parser documentation (#3356) * MNT: Remove CLI flags with expired deprecation periods (#3445) * MNT: Update pinned environment (#3440) * MNT: Bump pins, update RTD config (#3425) * MNT: Declare linux/amd64 platform during Docker build (#3422) * MNT: Bump astral-sh/setup-uv from 4 to 5 (#3417) * MNT: Test support for Python 3.13 (#3416) * MNT: Install Workbench CLI via conda (#3410) * MNT: Update minimum dependencies, test with tox-uv (#3412) * MNT: Install c3d through conda (#3382) * CI: Fetch tags and 200 commits to support describe (#3381) * CI: Build docker images in GHA, store cache inline and push to GHCR (#3380)
Changes proposed in this pull request
Closes #3368
This required massaging several kinks from
collect_derivatives
, so careful review of that would be appreciated.Documentation that should be reviewed