From 3793281b7e6e3066d39ad6aef4fe2e8962f6b581 Mon Sep 17 00:00:00 2001
From: Remi Gau <remi_gau@hotmail.com>
Date: Tue, 14 Feb 2023 16:11:25 +0100
Subject: [PATCH 1/7] split anat filename templates into parametric, non
 parametric, deface mask and add file collection list in qMRI

---
 src/appendices/qmri.md                        | 65 ++++++++++++++++
 .../magnetic-resonance-imaging-data.md        | 78 ++++++++++++++++---
 2 files changed, 132 insertions(+), 11 deletions(-)

diff --git a/src/appendices/qmri.md b/src/appendices/qmri.md
index e7f0040dee..2b4b37baa2 100644
--- a/src/appendices/qmri.md
+++ b/src/appendices/qmri.md
@@ -41,6 +41,49 @@ representing acquisition parameters (`echo`, `flip`, `inv`, `mt`) or file parts
 
 If a qMRI file collection is intended for creating structural quantitative maps (for example, `T1map`),
 files belonging to that collection are stored in the `anat` subdirectory.
+
+List of currently supported collections:
+
+<!--
+This block generates a suffix table.
+The definitions of these fields can be found in
+  src/schema/rules/files/raw
+and a guide for using macros can be found at
+ https://github.com/bids-standard/bids-specification/blob/master/macros_doc.md
+-->
+{{ MACROS___make_suffix_table(
+      [
+         "MESE",
+         "MEGRE",
+         "VFA",
+         "IRT1",
+         "MP2RAGE",
+         "MPM",
+         "MTS",
+         "MTR",
+      ]
+   )
+}}
+
+<!--
+This block generates a filename templates.
+The inputs for this macro can be found in the directory
+  src/schema/rules/files/raw
+and a guide for using macros can be found at
+ https://github.com/bids-standard/bids-specification/blob/master/macros_doc.md
+-->
+{{ MACROS___make_filename_template("raw", datatypes=["anat"], suffixes=[
+         "MESE",
+         "MEGRE",
+         "VFA",
+         "IRT1",
+         "MP2RAGE",
+         "MPM",
+         "MTS",
+         "MTR",
+      ])
+}}
+
 Below is an example file collection for `MP2RAGE`:
 
 <!-- This block generates a file tree.
@@ -193,6 +236,28 @@ Explanation of the table:
 
 #### Field maps
 
+<!--
+This block generates a suffix table.
+The definitions of these fields can be found in
+  src/schema/rules/files/raw
+and a guide for using macros can be found at
+ https://github.com/bids-standard/bids-specification/blob/master/macros_doc.md
+-->
+{{ MACROS___make_suffix_table(
+      [
+        "TB1DAM",
+        "TB1EPI",
+        "TB1AFI",
+        "TB1TFL",
+        "TB1RFM",
+        "RB1COR",
+        "TB1SRGE",
+        "TB1map",
+        "RB1map",
+      ]
+   )
+}}
+
 <!--
 This block generates a filename templates.
 The inputs for this macro can be found in the directory
diff --git a/src/modality-specific-files/magnetic-resonance-imaging-data.md b/src/modality-specific-files/magnetic-resonance-imaging-data.md
index 41cacd7e8f..9156cb5c45 100644
--- a/src/modality-specific-files/magnetic-resonance-imaging-data.md
+++ b/src/modality-specific-files/magnetic-resonance-imaging-data.md
@@ -165,16 +165,7 @@ whenever possible. See also
 
 ## Anatomy imaging data
 
-<!--
-This block generates a filename templates.
-The inputs for this macro can be found in the directory
-  src/schema/rules/files/raw
-and a guide for using macros can be found at
- https://github.com/bids-standard/bids-specification/blob/master/macros_doc.md
--->
-{{ MACROS___make_filename_template("raw", datatypes=["anat"]) }}
-
-Currently supported non-parametric structural MR images include:
+Currently supported non-parametric structural MR images include the following:
 
 <!--
 This block generates a suffix table.
@@ -199,6 +190,27 @@ and a guide for using macros can be found at
    )
 }}
 
+<!--
+This block generates a filename templates.
+The inputs for this macro can be found in the directory
+  src/schema/rules/files/raw
+and a guide for using macros can be found at
+ https://github.com/bids-standard/bids-specification/blob/master/macros_doc.md
+-->
+{{ MACROS___make_filename_template("raw", datatypes=["anat"], suffixes=[
+         "T1w",
+         "T2w",
+         "PDw",
+         "T2starw",
+         "FLAIR",
+         "inplaneT1",
+         "inplaneT2",
+         "PDT2",
+         "UNIT1",
+         "angio",
+      ])
+}}
+
 If the structural images included in the dataset were defaced (to protect
 identity of participants) one MAY provide the binary mask that was used to
 remove facial features in the form of `_defacemask` files.
@@ -207,6 +219,18 @@ entity corresponds to modality suffix,
 such as `T1w` or `inplaneT1`, referenced by the defacemask image.
 For example, `sub-01_mod-T1w_defacemask.nii.gz`.
 
+<!--
+This block generates a filename templates.
+The inputs for this macro can be found in the directory
+  src/schema/rules/files/raw
+and a guide for using macros can be found at
+ https://github.com/bids-standard/bids-specification/blob/master/macros_doc.md
+-->
+{{ MACROS___make_filename_template("raw", datatypes=["anat"], suffixes=[
+         "defacemask",
+      ])
+}}
+
 The OPTIONAL [`task-<label>`](../appendices/entities.md#task) entity can be used
 in order to allow tasks during structural MR acquisitions,
 for example pre-described motion paradigms such as nodding, to be described.
@@ -258,7 +282,8 @@ A guide for using macros can be found at
          },
       }
    }
-) }}
+)
+}}
 
 Phase images MAY be in radians or in arbitrary units.
 The sidecar JSON file MUST include the units of the `phase` image.
@@ -278,6 +303,8 @@ Similarly, the OPTIONAL [`rec-<label>`](../appendices/entities.md#rec)
 entity can be used to distinguish
 different reconstruction algorithms (for example ones using motion correction).
 
+### Parametric structural MR images
+
 Structural MR images whose intensity is represented in a non-arbitrary scale
 constitute parametric maps. Currently supported parametric maps include:
 
@@ -312,6 +339,35 @@ and a guide for using macros can be found at
    )
 }}
 
+<!--
+This block generates a filename templates.
+The inputs for this macro can be found in the directory
+  src/schema/rules/files/raw
+and a guide for using macros can be found at
+ https://github.com/bids-standard/bids-specification/blob/master/macros_doc.md
+-->
+{{ MACROS___make_filename_template("raw", datatypes=["anat"], suffixes=[
+         "T1map",
+         "R1map",
+         "T2map",
+         "R2map",
+         "T2starmap",
+         "R2starmap",
+         "PDmap",
+         "MTRmap",
+         "MTsat",
+         "T1rho",
+         "MWFmap",
+         "MTVmap",
+         "PDT2map",
+         "Chimap",
+         "TB1map",
+         "RB1map",
+         "S0map",
+         "M0map",
+      ])
+}}
+
 Parametric images listed in the table above are typically generated by
 processing a [file collection](../common-principles.md#entity-linked-file-collections).
 Please visit the [file collections appendix](../appendices/file-collections.md) to see the

From 1cfe60b5173763fd23baf5e0a609ef42a3344363 Mon Sep 17 00:00:00 2001
From: Remi Gau <remi_gau@hotmail.com>
Date: Mon, 20 Feb 2023 10:45:40 +0100
Subject: [PATCH 2/7] Apply suggestions from code review

Co-authored-by: Taylor Salo <tsalo90@gmail.com>
---
 .../magnetic-resonance-imaging-data.md               | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/modality-specific-files/magnetic-resonance-imaging-data.md b/src/modality-specific-files/magnetic-resonance-imaging-data.md
index 9156cb5c45..8692d7eb4f 100644
--- a/src/modality-specific-files/magnetic-resonance-imaging-data.md
+++ b/src/modality-specific-files/magnetic-resonance-imaging-data.md
@@ -165,6 +165,18 @@ whenever possible. See also
 
 ## Anatomy imaging data
 
+Anatomy MRI sequences measure static, structural features of the brain.
+Each type of contrast has an associated suffix, resulting in many suffixes for this datatype.
+For the sake of convenience, these suffixes are broadly divided into two groups: non-parametric and parametric.
+
+Non-parametric suffixes have an arbitrary scale.
+For example, T1w data are T1-weighted, but the values do not correspond to actual T1 value estimates.
+
+Parametric suffixes, on the other hand, have a non-arbitrary scale.
+A T1map file contains T1 value estimates, in seconds.
+
+### Non-parametric structural MR images
+
 Currently supported non-parametric structural MR images include the following:
 
 <!--

From 08e8d04a8d27f604355a071c13632ee7baf92e57 Mon Sep 17 00:00:00 2001
From: Remi Gau <remi_gau@hotmail.com>
Date: Mon, 20 Feb 2023 10:43:32 +0100
Subject: [PATCH 3/7] rm reconstruction definition

---
 .../magnetic-resonance-imaging-data.md                        | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/modality-specific-files/magnetic-resonance-imaging-data.md b/src/modality-specific-files/magnetic-resonance-imaging-data.md
index 8692d7eb4f..7c22c45bdc 100644
--- a/src/modality-specific-files/magnetic-resonance-imaging-data.md
+++ b/src/modality-specific-files/magnetic-resonance-imaging-data.md
@@ -311,10 +311,6 @@ For example, for `sub-01_part-phase_T1w.json`:
 
 When there is only a magnitude image of a given type, the `part` entity MAY be omitted.
 
-Similarly, the OPTIONAL [`rec-<label>`](../appendices/entities.md#rec)
-entity can be used to distinguish
-different reconstruction algorithms (for example ones using motion correction).
-
 ### Parametric structural MR images
 
 Structural MR images whose intensity is represented in a non-arbitrary scale

From 859d865e926858281f4b9bdad5a1af002fa888d4 Mon Sep 17 00:00:00 2001
From: Remi Gau <remi_gau@hotmail.com>
Date: Mon, 20 Feb 2023 10:55:59 +0100
Subject: [PATCH 4/7] move defacing and task sections

---
 .../magnetic-resonance-imaging-data.md        | 112 +++++++++---------
 1 file changed, 59 insertions(+), 53 deletions(-)

diff --git a/src/modality-specific-files/magnetic-resonance-imaging-data.md b/src/modality-specific-files/magnetic-resonance-imaging-data.md
index 7c22c45bdc..a4b4ebc8c3 100644
--- a/src/modality-specific-files/magnetic-resonance-imaging-data.md
+++ b/src/modality-specific-files/magnetic-resonance-imaging-data.md
@@ -166,14 +166,16 @@ whenever possible. See also
 ## Anatomy imaging data
 
 Anatomy MRI sequences measure static, structural features of the brain.
-Each type of contrast has an associated suffix, resulting in many suffixes for this datatype.
-For the sake of convenience, these suffixes are broadly divided into two groups: non-parametric and parametric.
 
-Non-parametric suffixes have an arbitrary scale.
-For example, T1w data are T1-weighted, but the values do not correspond to actual T1 value estimates.
+This datatype is divided into two groups:
+non-parametric and parametric.
 
-Parametric suffixes, on the other hand, have a non-arbitrary scale.
-A T1map file contains T1 value estimates, in seconds.
+Non-parametric structural images have an arbitrary scale.
+For example, T1w data are T1-weighted,
+but the values do not correspond to actual T1 value estimates.
+
+Parametric structural imaging, on the other hand, use a non-arbitrary scale.
+For example, a T1map file contains T1 value estimates, in seconds.
 
 ### Non-parametric structural MR images
 
@@ -223,53 +225,6 @@ and a guide for using macros can be found at
       ])
 }}
 
-If the structural images included in the dataset were defaced (to protect
-identity of participants) one MAY provide the binary mask that was used to
-remove facial features in the form of `_defacemask` files.
-In such cases, the OPTIONAL [`mod-<label>`](../appendices/entities.md#mod)
-entity corresponds to modality suffix,
-such as `T1w` or `inplaneT1`, referenced by the defacemask image.
-For example, `sub-01_mod-T1w_defacemask.nii.gz`.
-
-<!--
-This block generates a filename templates.
-The inputs for this macro can be found in the directory
-  src/schema/rules/files/raw
-and a guide for using macros can be found at
- https://github.com/bids-standard/bids-specification/blob/master/macros_doc.md
--->
-{{ MACROS___make_filename_template("raw", datatypes=["anat"], suffixes=[
-         "defacemask",
-      ])
-}}
-
-The OPTIONAL [`task-<label>`](../appendices/entities.md#task) entity can be used
-in order to allow tasks during structural MR acquisitions,
-for example pre-described motion paradigms such as nodding, to be described.
-
-<!-- This block generates a metadata table.
-The definitions of these fields can be found in
-  src/schema/objects/metadata.yaml
-and a guide for using macros can be found at
- https://github.com/bids-standard/bids-specification/blob/master/macros_doc.md
--->
-{{ MACROS___make_sidecar_table("anat.TaskMetadata") }}
-
-Some meta information about the acquisition MAY be provided in an additional
-JSON file. See [Common metadata fields](#common-metadata-fields) for a
-list of terms and their definitions. There are also some OPTIONAL JSON
-fields specific to anatomical scans:
-
-<!-- This block generates a metadata table.
-These tables are defined in
-  src/schema/rules/sidecars
-The definitions of the fields specified in these tables may be found in
-  src/schema/objects/metadata.yaml
-A guide for using macros can be found at
- https://github.com/bids-standard/bids-specification/blob/master/macros_doc.md
--->
-{{ MACROS___make_sidecar_table("anat.MRIAnatomyCommonMetadataFields") }}
-
 The [`part-<label>`](../appendices/entities.md#part) entity is
 used to indicate which component of the complex representation of the MRI
 signal is represented in voxel data.
@@ -386,6 +341,57 @@ recommended metadata fields, and the application specific entity or
 metadata requirement levels of [file collections](../appendices/file-collections.md) that can generate
 them, visit the [qMRI appendix](../appendices/qmri.md).
 
+### Defacing masks
+
+If the structural images included in the dataset were defaced (to protect
+identity of participants) one MAY provide the binary mask that was used to
+remove facial features in the form of `_defacemask` files.
+In such cases, the OPTIONAL [`mod-<label>`](../appendices/entities.md#mod)
+entity corresponds to modality suffix,
+such as `T1w` or `inplaneT1`, referenced by the defacemask image.
+For example, `sub-01_mod-T1w_defacemask.nii.gz`.
+
+<!--
+This block generates a filename templates.
+The inputs for this macro can be found in the directory
+  src/schema/rules/files/raw
+and a guide for using macros can be found at
+ https://github.com/bids-standard/bids-specification/blob/master/macros_doc.md
+-->
+{{ MACROS___make_filename_template("raw", datatypes=["anat"], suffixes=[
+         "defacemask",
+      ])
+}}
+
+### Task metadata for anatomical scans
+
+The OPTIONAL [`task-<label>`](../appendices/entities.md#task) entity can be used
+in order to allow tasks during structural MR acquisitions,
+for example pre-described motion paradigms such as nodding, to be described.
+
+<!-- This block generates a metadata table.
+The definitions of these fields can be found in
+  src/schema/objects/metadata.yaml
+and a guide for using macros can be found at
+ https://github.com/bids-standard/bids-specification/blob/master/macros_doc.md
+-->
+{{ MACROS___make_sidecar_table("anat.TaskMetadata") }}
+
+Some meta information about the acquisition MAY be provided in an additional
+JSON file. See [Common metadata fields](#common-metadata-fields) for a
+list of terms and their definitions. There are also some OPTIONAL JSON
+fields specific to anatomical scans:
+
+<!-- This block generates a metadata table.
+These tables are defined in
+  src/schema/rules/sidecars
+The definitions of the fields specified in these tables may be found in
+  src/schema/objects/metadata.yaml
+A guide for using macros can be found at
+ https://github.com/bids-standard/bids-specification/blob/master/macros_doc.md
+-->
+{{ MACROS___make_sidecar_table("anat.MRIAnatomyCommonMetadataFields") }}
+
 ### Deprecated suffixes
 
 Some suffixes that were available in versions of the specification prior to

From 7576eedec690d2fdc574e8ec2290688564b2ba1d Mon Sep 17 00:00:00 2001
From: Remi Gau <remi_gau@hotmail.com>
Date: Fri, 24 Feb 2023 12:12:00 +0100
Subject: [PATCH 5/7] rename heading and metadata group

---
 .../magnetic-resonance-imaging-data.md                        | 4 ++--
 src/schema/rules/sidecars/mri.yaml                            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modality-specific-files/magnetic-resonance-imaging-data.md b/src/modality-specific-files/magnetic-resonance-imaging-data.md
index a4b4ebc8c3..776a7e50fd 100644
--- a/src/modality-specific-files/magnetic-resonance-imaging-data.md
+++ b/src/modality-specific-files/magnetic-resonance-imaging-data.md
@@ -10,7 +10,7 @@ MRI acquisition parameters are divided into several categories based on
 [checklist](https://winnower-production.s3.amazonaws.com/papers/977/assets/993e199d-6bc3-4418-be3a-f620af1188b7-Parameter_Reporting_V1p3.pdf))
 by Ben Inglis.
 
-### Scanner Hardware
+### Hardware information
 
 <!-- This block generates a metadata table.
 These tables are defined in
@@ -20,7 +20,7 @@ The definitions of the fields specified in these tables may be found in
 A guide for using macros can be found at
  https://github.com/bids-standard/bids-specification/blob/master/macros_doc.md
 -->
-{{ MACROS___make_sidecar_table("mri.MRIScannerHardware") }}
+{{ MACROS___make_sidecar_table("mri.MRIHardware") }}
 
 Example for `ReceiveCoilActiveElements`:
 
diff --git a/src/schema/rules/sidecars/mri.yaml b/src/schema/rules/sidecars/mri.yaml
index 61ce836e2c..97383246a2 100644
--- a/src/schema/rules/sidecars/mri.yaml
+++ b/src/schema/rules/sidecars/mri.yaml
@@ -6,7 +6,7 @@
 
 ---
 # MRI Common metadata fields
-MRIScannerHardware:
+MRIHardware:
   selectors:
     - modality == "mri"
   fields:

From 6e7df7bc9810c07f5b35bef1efae8fca5ced5458 Mon Sep 17 00:00:00 2001
From: Remi Gau <remi_gau@hotmail.com>
Date: Fri, 24 Feb 2023 12:14:31 +0100
Subject: [PATCH 6/7] move institution information up

---
 .../magnetic-resonance-imaging-data.md        | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/modality-specific-files/magnetic-resonance-imaging-data.md b/src/modality-specific-files/magnetic-resonance-imaging-data.md
index 776a7e50fd..c334a5f5f9 100644
--- a/src/modality-specific-files/magnetic-resonance-imaging-data.md
+++ b/src/modality-specific-files/magnetic-resonance-imaging-data.md
@@ -10,6 +10,11 @@ MRI acquisition parameters are divided into several categories based on
 [checklist](https://winnower-production.s3.amazonaws.com/papers/977/assets/993e199d-6bc3-4418-be3a-f620af1188b7-Parameter_Reporting_V1p3.pdf))
 by Ben Inglis.
 
+When adding additional metadata please use the CamelCase version of
+[DICOM ontology terms](https://scicrunch.org/scicrunch/interlex/dashboard)
+whenever possible. See also
+[recommendations on JSON files](../common-principles.md#keyvalue-files-dictionaries).
+
 ### Hardware information
 
 <!-- This block generates a metadata table.
@@ -37,6 +42,18 @@ it is preferable for this field to be populated directly from the DICOM
 for each individual scan, so that it can be used as a mechanism for checking
 that a given scan was collected with the intended coil elements selected.
 
+### Institution information
+
+<!-- This block generates a metadata table.
+These tables are defined in
+  src/schema/rules/sidecars
+The definitions of the fields specified in these tables may be found in
+  src/schema/objects/metadata.yaml
+A guide for using macros can be found at
+ https://github.com/bids-standard/bids-specification/blob/master/macros_doc.md
+-->
+{{ MACROS___make_sidecar_table("mri.MRIInstitutionInformation") }}
+
 ### Sequence Specifics
 
 <!-- This block generates a metadata table.
@@ -146,23 +163,6 @@ A guide for using macros can be found at
 -->
 {{ MACROS___make_sidecar_table("mri.MRIEchoPlanarImagingAndB0Mapping") }}
 
-### Institution information
-
-<!-- This block generates a metadata table.
-These tables are defined in
-  src/schema/rules/sidecars
-The definitions of the fields specified in these tables may be found in
-  src/schema/objects/metadata.yaml
-A guide for using macros can be found at
- https://github.com/bids-standard/bids-specification/blob/master/macros_doc.md
--->
-{{ MACROS___make_sidecar_table("mri.MRIInstitutionInformation") }}
-
-When adding additional metadata please use the CamelCase version of
-[DICOM ontology terms](https://scicrunch.org/scicrunch/interlex/dashboard)
-whenever possible. See also
-[recommendations on JSON files](../common-principles.md#keyvalue-files-dictionaries).
-
 ## Anatomy imaging data
 
 Anatomy MRI sequences measure static, structural features of the brain.

From 268dc7b6326e469d31499907f4291d7ede946bd9 Mon Sep 17 00:00:00 2001
From: Remi Gau <remi_gau@hotmail.com>
Date: Tue, 28 Feb 2023 19:10:20 +0100
Subject: [PATCH 7/7] move filename template

---
 .../magnetic-resonance-imaging-data.md        | 48 ++++++++++---------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/modality-specific-files/magnetic-resonance-imaging-data.md b/src/modality-specific-files/magnetic-resonance-imaging-data.md
index c334a5f5f9..75679ee1f3 100644
--- a/src/modality-specific-files/magnetic-resonance-imaging-data.md
+++ b/src/modality-specific-files/magnetic-resonance-imaging-data.md
@@ -179,17 +179,14 @@ For example, a T1map file contains T1 value estimates, in seconds.
 
 ### Non-parametric structural MR images
 
-Currently supported non-parametric structural MR images include the following:
-
 <!--
-This block generates a suffix table.
-The definitions of these fields can be found in
+This block generates a filename templates.
+The inputs for this macro can be found in the directory
   src/schema/rules/files/raw
 and a guide for using macros can be found at
  https://github.com/bids-standard/bids-specification/blob/master/macros_doc.md
 -->
-{{ MACROS___make_suffix_table(
-      [
+{{ MACROS___make_filename_template("raw", datatypes=["anat"], suffixes=[
          "T1w",
          "T2w",
          "PDw",
@@ -200,18 +197,20 @@ and a guide for using macros can be found at
          "PDT2",
          "UNIT1",
          "angio",
-      ]
-   )
+      ])
 }}
 
+Currently supported non-parametric structural MR images include the following:
+
 <!--
-This block generates a filename templates.
-The inputs for this macro can be found in the directory
+This block generates a suffix table.
+The definitions of these fields can be found in
   src/schema/rules/files/raw
 and a guide for using macros can be found at
  https://github.com/bids-standard/bids-specification/blob/master/macros_doc.md
 -->
-{{ MACROS___make_filename_template("raw", datatypes=["anat"], suffixes=[
+{{ MACROS___make_suffix_table(
+      [
          "T1w",
          "T2w",
          "PDw",
@@ -222,7 +221,8 @@ and a guide for using macros can be found at
          "PDT2",
          "UNIT1",
          "angio",
-      ])
+      ]
+   )
 }}
 
 The [`part-<label>`](../appendices/entities.md#part) entity is
@@ -269,17 +269,16 @@ When there is only a magnitude image of a given type, the `part` entity MAY be o
 ### Parametric structural MR images
 
 Structural MR images whose intensity is represented in a non-arbitrary scale
-constitute parametric maps. Currently supported parametric maps include:
+constitute parametric maps.
 
 <!--
-This block generates a suffix table.
-The definitions of these fields can be found in
+This block generates a filename templates.
+The inputs for this macro can be found in the directory
   src/schema/rules/files/raw
 and a guide for using macros can be found at
  https://github.com/bids-standard/bids-specification/blob/master/macros_doc.md
 -->
-{{ MACROS___make_suffix_table(
-      [
+{{ MACROS___make_filename_template("raw", datatypes=["anat"], suffixes=[
          "T1map",
          "R1map",
          "T2map",
@@ -298,18 +297,20 @@ and a guide for using macros can be found at
          "RB1map",
          "S0map",
          "M0map",
-      ]
-   )
+      ])
 }}
 
+Currently supported parametric maps include:
+
 <!--
-This block generates a filename templates.
-The inputs for this macro can be found in the directory
+This block generates a suffix table.
+The definitions of these fields can be found in
   src/schema/rules/files/raw
 and a guide for using macros can be found at
  https://github.com/bids-standard/bids-specification/blob/master/macros_doc.md
 -->
-{{ MACROS___make_filename_template("raw", datatypes=["anat"], suffixes=[
+{{ MACROS___make_suffix_table(
+      [
          "T1map",
          "R1map",
          "T2map",
@@ -328,7 +329,8 @@ and a guide for using macros can be found at
          "RB1map",
          "S0map",
          "M0map",
-      ])
+      ]
+   )
 }}
 
 Parametric images listed in the table above are typically generated by