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

Re-enable anat fasttrack for dataset without t1w #3202

Merged
merged 11 commits into from
Jan 18, 2024

Conversation

bpinsard
Copy link
Collaborator

@bpinsard bpinsard commented Jan 15, 2024

Changes proposed in this pull request

fixes #3201
Re-enables the possibility to run fMRIPrep on a fMRI only dataset using anat derivatives from another (anatomical) dataset with the same participant.

Tries to implement integration test for that feature.

related to #2201

Documentation that should be reviewed

NA

Copy link

codecov bot commented Jan 15, 2024

Codecov Report

Attention: 2 lines in your changes are missing coverage. Please review.

Comparison is base (de72651) 72.36% compared to head (e56a819) 72.35%.
Report is 2 commits behind head on master.

Files Patch % Lines
fmriprep/cli/parser.py 0.00% 1 Missing ⚠️
fmriprep/workflows/base.py 66.66% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #3202      +/-   ##
==========================================
- Coverage   72.36%   72.35%   -0.01%     
==========================================
  Files          55       55              
  Lines        4103     4106       +3     
==========================================
+ Hits         2969     2971       +2     
- Misses       1134     1135       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@bpinsard
Copy link
Collaborator Author

Question for CircleCI experts: is there an easy way to run part of the tests locally?

@effigies
Copy link
Member

Question for CircleCI experts: is there an easy way to run part of the tests locally?

Not really. You need to set up the test data in the same way as the workflow.

@bpinsard bpinsard force-pushed the fix/fasttrack_noT1w branch 2 times, most recently from d3d6f33 to 9201c24 Compare January 15, 2024 21:20
@bpinsard bpinsard force-pushed the fix/fasttrack_noT1w branch from 9201c24 to e0e260d Compare January 16, 2024 01:04
@bpinsard
Copy link
Collaborator Author

After a lot of mistakes I managed to get the added circleci test to work. 🤦🏼

It still raises coverage issue, should I expand coverage for this usecase?
It seems that it would require duplicating large parts of https://github.com/nipreps/fmriprep/blob/master/fmriprep/workflows/tests/test_base.py while it doesn't cover the --derivatives option.

@effigies
Copy link
Member

Coverage is always a pain, please don't worry about it. I'll have a look at this today.

fmriprep/utils/bids.py Outdated Show resolved Hide resolved
fmriprep/utils/bids.py Outdated Show resolved Hide resolved
bpinsard and others added 2 commits January 16, 2024 16:18
Co-authored-by: Chris Markiewicz <effigies@gmail.com>
.circleci/config.yml Show resolved Hide resolved
.circleci/config.yml Outdated Show resolved Hide resolved
trying to reuse the workdir, IIRC it gave me errors before

Co-authored-by: Chris Markiewicz <effigies@gmail.com>
@effigies effigies merged commit f719949 into nipreps:master Jan 18, 2024
15 of 17 checks passed
@bpinsard
Copy link
Collaborator Author

Thanks @effigies for all your help in making this PR merged on a short time!

@bpinsard bpinsard deleted the fix/fasttrack_noT1w branch January 18, 2024 20:45
effigies added a commit that referenced this pull request Jun 17, 2024
24.0.0 (June 17, 2024)

New feature release in the 24.0.x series.

This release is an incremental improvement on 23.2.x, with some
fixes for bugs discovered in the updated workflow.

New features include separation of HTML reports by session for subjects
with many BOLD runs, a new ``--fs-no-resume`` option to improve interoperability
with less typical FreeSurfer directories, such as those generated by longitudinal
FreeSurfer or FastSurfer, and adoption of DatasetLinks and BIDS-URIs, to follow
the recommendations of recent versions of BIDS.

With thanks to Dimitri Papadopoulos, Basile Pinsard, Celine Provins, Taylor Salo
and Wang Hao-Ting for their contributions!

* FIX: Add "double" type to allowed DisplacementFieldTransform (#3287)
* FIX: Require recent templateflow, select correct aparc dseg.tsv (#3256)
* FIX: Ensure proper templates are retrieved with sloppy (#3251)
* FIX: Delete summary from functional report when separated by sessions (#3223)
* FIX: Support lists in bids filter file containing ``null`` or ``*`` (#3215)
* FIX: Re-enable anat fasttrack for dataset without t1w (#3202)
* ENH: Use BIDSURI in init_ds_boldmask_wf (#3297)
* ENH: Add templateflow to DatasetLinks (#3267)
* ENH: Track proximal sources of functional GIFTIs (#3263)
* ENH: Support named derivative paths (#3264)
* ENH: Track Sources for standard-space outputs (#3262)
* ENH: Add --fs-no-resume option to reuse existing FreeSurfer outputs without resuming (#3142)
* ENH: Use BIDS URIs to track Sources in sidecars (#3255)
* ENH: Ignore unselected subjects in BIDSLayoutIndexer (#3236)
* ENH: Add metadata for motion parameters (#3245)
* ENH: Separate anatomical and functional reports per session for densely sampled dataset (#3191)
* ENH: Leverage T2w if available for BOLD -> anat coregistration (#3208)
* RF: Fix ITK warp conversion to nitransforms format (#3300)
* RF: Load report assembler from nireports (#3177)
* DOC: Clarify ``--dvars-spike-threshold`` uses standardized DVARS (#3205)
* TST: Update test to reflect new report generation behavior (#3210)
* STY: Manual conversions to f-strings (#3241)
* STY: Apply ruff/pyupgrade rule UP031 (#3280)
* STY: Lint and style check full repository (#3221)
* STY: Adopt ruff for linting and formatting (#3206)
* MNT: Pin libitk 5.3 and note dependencies (#3298)
* MNT: Upgrade ruff pre-commit, add fixing checks (#3283)
* MNT: Complete transition from flake8/black to ruff (#3279)
* MNT: Apply Repo-Review suggestions (#3194)
* MNT: Verbatim copy of Apache license 2.0 (#3259)
* MNT: Bump cryptography from 41.0.7 to 42.0.4 (#3234)
* MNT: Drop copyright year, unused dunder fields (#3247)
* MNT: Update environment pins (#3226)
* MNT: Bump codecov/codecov-action from 3 to 4 (#3219)
* DOCKER: Restore mincinfo binary (#3249)
* CI: Move to new circle machine tags (#3248)
* CI: Avoid ruff warning (#3244)
* CI: Pass ruff tests (#3243)
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.

23.2.0 breaks anat-fast-track on dataset without T1w
2 participants