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

Write out reports to individual reconstruction derivative folders #53

Merged
merged 51 commits into from
Aug 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
9959f89
Try a thing or five.
tsalo Aug 14, 2024
25c8c37
More stuff.
tsalo Aug 14, 2024
f768c97
Run isort.
tsalo Aug 14, 2024
7100f18
Whoops.
tsalo Aug 14, 2024
9e3edb6
Refactor AMICO workflow a bit.
tsalo Aug 14, 2024
44e6437
Modify stuff.
tsalo Aug 14, 2024
5990beb
Fix config.
tsalo Aug 14, 2024
6459133
Update amico_noddi_outputs.txt
tsalo Aug 14, 2024
81d38d1
update
tsalo Aug 14, 2024
833fbe3
Update base.py
tsalo Aug 14, 2024
4dcfa7c
Revert "Update base.py"
tsalo Aug 14, 2024
1ae68ff
Update bids.py
tsalo Aug 14, 2024
9f44bb5
Fix clean_datasinks.
tsalo Aug 15, 2024
49541e1
Fix.
tsalo Aug 15, 2024
33da167
Use DerivativesDataSink consistently.
tsalo Aug 15, 2024
f286509
Dismiss desc when necessary.
tsalo Aug 15, 2024
61034b8
Update dsi_studio.py
tsalo Aug 15, 2024
5f2bdd0
Update reports-spec.yml
tsalo Aug 15, 2024
f1da64d
Dismiss desc.
tsalo Aug 15, 2024
d5e9204
Update recon_scalars.py
tsalo Aug 15, 2024
7db85d9
Dismiss desc.
tsalo Aug 15, 2024
8d2d500
Update reports-spec.yml
tsalo Aug 15, 2024
4ccecaa
Update io_spec.json
tsalo Aug 15, 2024
b802426
More fixes.
tsalo Aug 15, 2024
b7b9463
Update bids.py
tsalo Aug 15, 2024
5379ba4
Try converting to SVG.
tsalo Aug 15, 2024
a539eea
Keep working.
tsalo Aug 15, 2024
b89421c
Try fixing.
tsalo Aug 15, 2024
3d4d5e4
Update utils.py
tsalo Aug 15, 2024
db04d26
Update pyproject.toml
tsalo Aug 15, 2024
e303e9b
Fix fix fix.
tsalo Aug 15, 2024
37aa98b
Update bids.py
tsalo Aug 15, 2024
7677471
Update bids.py
tsalo Aug 15, 2024
1c3b710
Fix.
tsalo Aug 15, 2024
fc7a1ba
Update bids.py
tsalo Aug 15, 2024
4eeac4b
Update scalar_mapping.py
tsalo Aug 16, 2024
f483835
Pass in qsirecon_suffix as None.
tsalo Aug 16, 2024
41af274
Merge branch 'main' into improve-reports
tsalo Aug 16, 2024
27a5ba3
Drop PNGtoSVG.
tsalo Aug 16, 2024
70ebdef
Merge branch 'main' into improve-reports
tsalo Aug 16, 2024
14a3ce6
Whoops.
tsalo Aug 16, 2024
39209ee
Merge branch 'improve-reports' of https://github.com/PennLINC/qsireco…
tsalo Aug 16, 2024
397b9e2
Update recon_scalars.py
tsalo Aug 16, 2024
6158c87
Try this.
tsalo Aug 16, 2024
ea33761
Update scalar_mapping.py
tsalo Aug 16, 2024
2e4566e
Update bids.py
tsalo Aug 16, 2024
638afe5
Please work.
tsalo Aug 16, 2024
962375b
Okay maybe this will work.
tsalo Aug 16, 2024
c02cc64
Argh!
tsalo Aug 16, 2024
e127aba
Merge branch 'main' into improve-reports
tsalo Aug 16, 2024
f5d8862
update
tsalo Aug 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 0 additions & 52 deletions qsirecon/data/bids.json

This file was deleted.

59 changes: 59 additions & 0 deletions qsirecon/data/io_spec.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"name": "qsirecon",
"entities": [
{
"name": "datatype",
"pattern": "[/\\\\]+(anat|beh|dwi|eeg|figures|fmap|func|ieeg|meg|micr|perf|pet)[/\\\\]+"
},
{
"name": "cohort",
"pattern": "(?:^|_)cohort-([0-9]+)",
"dtype": "int"
},
{
"name": "atlas",
"pattern": "(?:^|_)atlas-([a-zA-Z0-9]+)"
},
{
"name": "model",
"pattern": "(?:^|_)model-([a-zA-Z0-9]+)"
},
{
"name": "bundles",
"pattern": "(?:^|_)bundles-([a-zA-Z0-9]+)"
},
{
"name": "fit",
"pattern": "(?:^|_)fit-([a-zA-Z0-9]+)"
},
{
"name": "mdp",
"pattern": "(?:^|_)mdp-([a-zA-Z0-9]+)"
},
{
"name": "mfp",
"pattern": "(?:^|_)mfp-([a-zA-Z0-9]+)"
},
{
"name": "bundle",
"pattern": "(?:^|_)bundle-([a-zA-Z0-9]+)"
},
{
"name": "label",
"pattern": "(?:^|_)label-([a-zA-Z0-9]+)"
}
],
"default_path_patterns": [
"sub-{subject}[/ses-{session}]/{datatype<dwi>|dwi}/sub-{subject}[_ses-{session}][_acq-{acquisition}][_ce-{ceagent}][_dir-{direction}][_rec-{reconstruction}][_run-{run}][_space-{space}][_cohort-{cohort}][_atlas-{atlas}][_model-{model}][_bundles-{bundles}][_fit-{fit}][_mdp-{mdp}][_mfp-{mfp}][_bundle-{bundle}][_label-{label}][_desc-{desc}]_{suffix<dwimap>}.{extension<nii|nii.gz|fib|fib.gz|mif|mif.gz|pickle.gz|txt|json>|nii.gz}",
"sub-{subject}[/ses-{session}]/{datatype<dwi>|dwi}/sub-{subject}[_ses-{session}][_acq-{acquisition}][_ce-{ceagent}][_dir-{direction}][_rec-{reconstruction}][_run-{run}][_space-{space}][_cohort-{cohort}][_atlas-{atlas}][_model-{model}][_bundles-{bundles}][_fit-{fit}][_mdp-{mdp}][_mfp-{mfp}][_bundle-{bundle}][_label-{label}][_desc-{desc}]_{suffix<streamlines>}.{extension<tck|tck.gz|json>|tck.gz}",
"sub-{subject}[/ses-{session}]/{datatype<dwi>|dwi}/sub-{subject}[_ses-{session}][_acq-{acquisition}][_ce-{ceagent}][_dir-{direction}][_rec-{reconstruction}][_run-{run}][_space-{space}][_cohort-{cohort}][_atlas-{atlas}][_model-{model}][_bundles-{bundles}][_fit-{fit}][_mdp-{mdp}][_mfp-{mfp}][_bundle-{bundle}][_label-{label}][_desc-{desc}]_{suffix<scalarstats|tdistats|bundlestats|streamlineweights>}.{extension<tsv|csv|json>|tsv}",
"sub-{subject}[/ses-{session}]/{datatype<dwi>|dwi}/sub-{subject}[_ses-{session}][_acq-{acquisition}][_ce-{ceagent}][_dir-{direction}][_rec-{reconstruction}][_run-{run}][_space-{space}][_cohort-{cohort}][_atlas-{atlas}][_model-{model}][_bundles-{bundles}][_fit-{fit}][_mdp-{mdp}][_mfp-{mfp}][_bundle-{bundle}][_label-{label}][_desc-{desc}]_{suffix<mapping>}.{extension<map|map.gz|json>|map.gz}",
"sub-{subject}[/ses-{session}]/{datatype<dwi>|dwi}/sub-{subject}[_ses-{session}][_acq-{acquisition}][_ce-{ceagent}][_dir-{direction}][_rec-{reconstruction}][_run-{run}][_space-{space}][_cohort-{cohort}][_atlas-{atlas}][_model-{model}][_bundles-{bundles}][_fit-{fit}][_mdp-{mdp}][_mfp-{mfp}][_bundle-{bundle}][_label-{label}][_desc-{desc}]_{suffix<dseg>}.{extension<mif.gz|nii.gz|nii|txt|json>|nii.gz}",
"sub-{subject}[/ses-{session}]/{datatype<dwi>|dwi}/sub-{subject}[_ses-{session}][_acq-{acquisition}][_ce-{ceagent}][_dir-{direction}][_rec-{reconstruction}][_run-{run}][_space-{space}][_cohort-{cohort}][_atlas-{atlas}][_model-{model}][_bundles-{bundles}][_fit-{fit}][_mdp-{mdp}][_mfp-{mfp}][_bundle-{bundle}][_label-{label}][_desc-{desc}]_{suffix<mu>}.{extension<txt|json>|txt}",
"sub-{subject}[/ses-{session}]/{datatype<dwi>|dwi}/sub-{subject}[_ses-{session}][_acq-{acquisition}][_ce-{ceagent}][_dir-{direction}][_rec-{reconstruction}][_run-{run}][_space-{space}][_cohort-{cohort}][_atlas-{atlas}][_model-{model}][_bundles-{bundles}][_fit-{fit}][_mdp-{mdp}][_mfp-{mfp}][_bundle-{bundle}][_label-{label}][_desc-{desc}]_{suffix<exemplarbundles>}.{extension<zip|json>|zip}",
"sub-{subject}[/ses-{session}]/{datatype<dwi>|dwi}/sub-{subject}[_ses-{session}][_acq-{acquisition}][_ce-{ceagent}][_dir-{direction}][_rec-{reconstruction}][_run-{run}][_space-{space}][_cohort-{cohort}][_atlas-{atlas}][_model-{model}][_bundles-{bundles}][_fit-{fit}][_mdp-{mdp}][_mfp-{mfp}][_bundle-{bundle}][_label-{label}][_desc-{desc}]_{suffix<connectivity>}.{extension<mat|json>|mat}",
"sub-{subject}/{datatype<figures>}/sub-{subject}[_ses-{session}][_acq-{acquisition}][_ce-{ceagent}][_dir-{direction}][_rec-{reconstruction}][_run-{run}][_space-{space}][_cohort-{cohort}][_atlas-{atlas}][_model-{model}][_bundles-{bundles}][_fit-{fit}][_mdp-{mdp}][_mfp-{mfp}][_bundle-{bundle}][_label-{label}][_desc-{desc}]_{suffix<dwi>}.{extension<html|svg|png|json>}",
"sub-{subject}/{datatype<figures>}/sub-{subject}[_ses-{session}][_acq-{acquisition}][_ce-{ceagent}][_dir-{direction}][_rec-{reconstruction}][_run-{run}][_space-{space}][_cohort-{cohort}][_atlas-{atlas}][_model-{model}][_bundles-{bundles}][_fit-{fit}][_mdp-{mdp}][_mfp-{mfp}][_bundle-{bundle}][_label-{label}][_desc-{desc}]_{suffix<peaks>}.{extension<html|svg|png|json>}",
"sub-{subject}/{datatype<figures>}/sub-{subject}[_ses-{session}][_acq-{acquisition}][_ce-{ceagent}][_dir-{direction}][_rec-{reconstruction}][_run-{run}][_space-{space}][_cohort-{cohort}][_atlas-{atlas}][_model-{model}][_bundles-{bundles}][_fit-{fit}][_mdp-{mdp}][_mfp-{mfp}][_bundle-{bundle}][_label-{label}][_desc-{desc}]_{suffix<odfs|matrices>}.{extension<html|svg|png|json>}"
]
}
Loading