-
Notifications
You must be signed in to change notification settings - Fork 307
enh: add boldref / sbref to source metadata #3532
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
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #3532 +/- ##
==========================================
+ Coverage 73.72% 73.73% +0.01%
==========================================
Files 60 60
Lines 4757 4756 -1
Branches 615 615
==========================================
Hits 3507 3507
+ Misses 1109 1108 -1
Partials 141 141 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
|
Looking at the boldref sources for one of the CI runs.. the idea behind this change was to make it easier to trace whether an sbref or the hmc boldref (which is a derivative of the bold series itself) was used to create it. I don't think we should include working directory files in the sources, so we could consider a few options:
|
|
Just to pull the contents:
{
"Sources": [
"/scratch/fmriprep_25_2_wf/sub_02_wf/bold_task_cuedSGT_run_01_echo_1_wf/bold_fit_wf/hmc_boldref_wf/gen_avg/sub-02_task-cuedSGT_run-01_echo-1_bold_valid_average.nii.gz",
"bids::sub-02/func/sub-02_task-cuedSGT_run-01_from-boldref_to-auto00000_mode-image_desc-fmap_xfm.txt",
"/scratch/fmriprep_25_2_wf/sub_02_wf/fmap_preproc_wf/wf_auto_00000/bs_filter/fmap_syn0Warp_Hz_trans_coeff000.nii.gz"
]
} |
|
I think this just shows that we're not using the outputs of a datasink in our buffers. I'll fix that. |
883fecd to
1f0af9d
Compare
|
sub-100185_task-machinegame_run-01_desc-coreg_boldref.json: {
"Sources": [
"bids:raw:sub-100185/func/sub-100185_task-machinegame_run-01_sbref.nii.gz",
"bids::sub-100185/func/sub-100185_task-machinegame_run-01_from-boldref_to-auto00000_mode-image_desc-fmap_xfm.txt",
"bids::sub-100185/fmap/sub-100185_fmapid-auto00000_desc-coeff_fieldmap.nii.gz"
]
}sub-100185_task-machinegame_run-01_from-boldref_to-T1w_mode-image_desc-coreg_xfm.json {
"GeneratedBy": [
{
"Name": "flirt",
"Version": "<unknown>"
}
],
"Sources": [
"bids::sub-100185/func/sub-100185_task-machinegame_run-01_desc-coreg_boldref.nii.gz"
]
}sub-100185_task-machinegame_run-01_from-boldref_to-auto00000_mode-image_desc-fmap_xfm.json {
"Sources": [
"bids:raw:sub-100185/func/sub-100185_task-machinegame_run-01_sbref.nii.gz",
"bids::sub-100185/fmap/sub-100185_fmapid-auto00000_desc-magnitude_fieldmap.nii.gz"
]
}sub-100185_task-machinegame_run-02_desc-coreg_boldref.json {
"Sources": [
"bids:raw:sub-100185/func/sub-100185_task-machinegame_run-02_sbref.nii.gz",
"bids::sub-100185/func/sub-100185_task-machinegame_run-02_from-boldref_to-auto00000_mode-image_desc-fmap_xfm.txt",
"bids::sub-100185/fmap/sub-100185_fmapid-auto00000_desc-coeff_fieldmap.nii.gz"
]
}sub-02_task-cuedSGT_run-01_desc-coreg_boldref.json {
"Sources": [
"bids::sub-02/func/sub-02_task-cuedSGT_run-01_desc-hmc_boldref.nii.gz",
"bids::sub-02/func/sub-02_task-cuedSGT_run-01_from-boldref_to-auto00000_mode-image_desc-fmap_xfm.txt",
"bids::sub-02/fmap/sub-02_run-01_fmapid-auto00000_desc-coeff_fieldmap.nii.gz"
]
}This could definitely be fleshed out more, but we're getting fieldmap and boldref/sbref sources from the input/output directories. I would suggest that we merge nipreps/sdcflows#506 and this and open an issue with "ideal" source lists that can be worked toward piecemeal. After nipreps/sdcflows#506 is merged, I'll rebase this and relock the pixi environment. |
for more information, see https://pre-commit.ci
1f0af9d to
10c20b9
Compare
effigies
left a comment
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.
I think this is good to go. Please merge if you're happy with it.
|
looks great - thanks for the assist |
25.2.0 (October 01, 2025) New feature release in the 25.2.x series. This release is an *fMRIPrep Long-Term Support (LTS)* release. The planned support window is 4 years, until October 2029. This release is an incremental improvement over 25.1.x, but includes some fixes and improvements that do not fit within our `bug-fix policy <https://www.nipreps.org/devs/releases/#bug-fix-releases>`__. Importantly, the change in interpolation in 25.1.0 introduced artifacts for some datasets. This release changes the default interpolation mode to ``grid-constant``, which resolves those problems while not reintroducing the issue the previous release sought to fix. This release also (finally) introduces per-session processing. The ``--session-label`` flag selects the sessions to process, and the ``--subject-anatomical-reference`` flag indicates whether and how to combine across sessions. Existing filters passed via ``--bids-filter-file`` may need to be updated or removed in favor of using these flags to achieve the desired behavior. We would like to thank the AMP-SCZ and ENIGMA consortia for testing out and providing feedback on this release. * FIX: Clean up output report language (#3529) * FIX: Default to grid-constant interpolation mode (#3516) * FIX: Adapt to transposed ndcoords in nitransforms (#3517) * FIX: Write out Freesurfer-derived outputs (#3512) * FIX: Add kwargs to _warnings.py (#3483) * ENH: Resample BOLD data to any surface template space using the Connectome Workbench (#3461) * ENH: Add boldref / sbref to source metadata (#3532) * ENH: Add dedicated session filtering, alternative anatomical template options (#3495) * ENH: Write out goodvoxels mask (#3513) * ENH: Add registration metadata to boldref-to-anat transforms (#3500) * ENH: Write out cortex mask GIFTIs (#3491) * ENH: Update transforms.py according to new transform chain of nitransforms (#3494) * RF/DOC: Improve and document command-line parser defaults (#3487) * DOC: Explain better SDC and B0FieldSource requirement (#2768) * DOC: Document `freesurfer` parameter in BOLD confound workflow init (#3504) * DOC: Add myself to contributor list (#3506) * DOC: Fix non-standard Input/Output docstring section management (#3505) * MNT: Split Dockerfile into base and pixi layers (#3521) * MNT: Replace conda with pixi and lock (#3503) * MNT: Update license metadata using SPDX expression (#3486) * MNT: no need to re-run `ruff check` after `ruff format` (#3480) * MNT: Update pre-commit ruff legacy alias (#3479)
Closes #3498