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

[FIX] Re-align the text and the schema for filenames in derivatives #1567

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
5 changes: 3 additions & 2 deletions src/derivatives/common-data-types.md
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,9 @@ Template:
```Text
<pipeline_name>/
sub-<label>/
<datatype>/
<source_entities>[_space-<space>][_desc-<label>]_<suffix>.<extension>
[ses-<label>/]
<datatype>/
<source_entities>[_space-<space>][_desc-<label>]_<suffix>.<extension>
```

Data is considered to be *preprocessed* or *cleaned* if the data type of the input,
Expand Down
25 changes: 15 additions & 10 deletions src/derivatives/imaging.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ Template:
```Text
<pipeline_name>/
sub-<label>/
<datatype>/
<source_entities>[_space-<space>][_res-<label>][_den-<label>][_desc-<label>]_<suffix>.<extension>
[ses-<label>/]
<datatype>/
<source_entities>[_space-<space>][_res-<label>][_den-<label>][_desc-<label>]_<suffix>.<extension>
```

Volumetric preprocessing does not modify the number of dimensions, and so
Expand Down Expand Up @@ -147,8 +148,9 @@ Template:
```Text
<pipeline_name>/
sub-<label>/
anat|func|dwi/
<source_entities>[_space-<space>][_res-<label>][_den-<label>][_label-<label>][_desc-<label>]_mask.nii.gz
[ses-<label>/]
anat|func|dwi/
<source_entities>[_space-<space>][_res-<label>][_den-<label>][_label-<label>][_desc-<label>]_mask.nii.gz
mguaypaq marked this conversation as resolved.
Show resolved Hide resolved
```

A binary (1 - inside, 0 - outside) mask in the space defined by the [`space` entity](../appendices/entities.md#space).
Expand Down Expand Up @@ -267,8 +269,9 @@ Template:
```Text
<pipeline_name>/
sub-<label>/
anat|func|dwi/
<source_entities>[_space-<space>][_atlas-<label>][_res-<label>][_den-<label>]_dseg.nii.gz
[ses-<label>/]
anat|func|dwi/
<source_entities>[_space-<space>][_atlas-<label>][_res-<label>][_den-<label>][_desc-<label>]_dseg.nii.gz
mguaypaq marked this conversation as resolved.
Show resolved Hide resolved
```

Example:
Expand Down Expand Up @@ -332,8 +335,9 @@ Template:
```Text
<pipeline_name>/
sub-<label>/
func|anat|dwi/
<source_entities>[_space-<space>][_atlas-<label>][_res-<label>][_den-<label>][_label-<label>]_probseg.nii.gz
[ses-<label>/]
func|anat|dwi/
<source_entities>[_space-<space>][_atlas-<label>][_res-<label>][_den-<label>][_label-<label>][_desc-<label>]_probseg.nii.gz
mguaypaq marked this conversation as resolved.
Show resolved Hide resolved
```

Example:
Expand Down Expand Up @@ -406,8 +410,9 @@ Template:
```Text
<pipeline_name>/
sub-<label>/
anat/
<source_entities>[_hemi-{L|R}][_space-<space>][_atlas-<label>][_res-<label>][_den-<label>]_dseg.{label.gii|dlabel.nii}
[ses-<label>/]
anat/
<source_entities>[_hemi-{L|R}][_space-<space>][_atlas-<label>][_res-<label>][_den-<label>][_desc-<label>]_dseg.{label.gii|dlabel.nii}
mguaypaq marked this conversation as resolved.
Show resolved Hide resolved
```

The [`hemi-<label>`](../appendices/entities.md#hemi) entity is REQUIRED for GIFTI files storing information about
Expand Down
10 changes: 10 additions & 0 deletions src/schema/rules/files/deriv/imaging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ anat_parametric_discrete_segmentation:
entities:
$ref: rules.files.raw.anat.parametric.entities
space: optional
atlas: optional
resolution: optional
density: optional
description: optional
Expand All @@ -106,6 +107,7 @@ anat_nonparametric_discrete_segmentation:
entities:
$ref: rules.files.raw.anat.nonparametric.entities
space: optional
atlas: optional
resolution: optional
density: optional
description: optional
Expand All @@ -122,6 +124,7 @@ func_discrete_segmentation:
entities:
$ref: rules.files.raw.func.func.entities
space: optional
atlas: optional
resolution: optional
density: optional
description: optional
Expand All @@ -133,6 +136,7 @@ dwi_discrete_segmentation:
entities:
$ref: rules.files.raw.dwi.dwi.entities
space: optional
atlas: optional
resolution: optional
density: optional
description: optional
Expand All @@ -144,6 +148,7 @@ anat_parametric_probabilistic_segmentation:
entities:
$ref: rules.files.raw.anat.parametric.entities
space: optional
atlas: optional
resolution: optional
density: optional
label: optional
Expand All @@ -156,6 +161,7 @@ anat_nonparametric_probabilistic_segmentation:
entities:
$ref: rules.files.raw.anat.nonparametric.entities
space: optional
atlas: optional
resolution: optional
density: optional
label: optional
Expand All @@ -168,6 +174,7 @@ func_probabilistic_segmentation:
entities:
$ref: rules.files.raw.func.func.entities
space: optional
atlas: optional
resolution: optional
density: optional
label: optional
Expand All @@ -180,6 +187,7 @@ dwi_probabilistic_segmentation:
entities:
$ref: rules.files.raw.dwi.dwi.entities
space: optional
atlas: optional
resolution: optional
density: optional
label: optional
Expand All @@ -198,6 +206,7 @@ anat_parametic_discrete_surface:
$ref: rules.files.raw.anat.parametric.entities
hemisphere: optional
space: optional
atlas: optional
resolution: optional
density: optional
description: optional
Expand All @@ -215,6 +224,7 @@ anat_nonparametic_discrete_surface:
$ref: rules.files.raw.anat.nonparametric.entities
hemisphere: optional
space: optional
atlas: optional
resolution: optional
density: optional
description: optional