schema: Update metaschema, fix errors caught by metaschema

bids-standard · Nov 5, 2024 · ac745e6 · ac745e6
1 parent 226f134
commit ac745e6
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 20 deletions.
diff --git a/src/metaschema.json b/src/metaschema.json
@@ -361,6 +361,18 @@
               "required": ["core", "tables"],
               "additionalProperties": false
             },
+            "atlas": {
+              "type": "object",
+              "patternProperties": {
+                "^[a-z_]+$": {
+                  "type": "object",
+                  "patternProperties": {
+                    "^[a-zA-Z0-9_]+$": { "$ref": "#/definitions/suffixRule" }
+                  }
+                }
+              },
+              "additionalProperties": false
+            },
             "deriv": {
               "type": "object",
               "patternProperties": {

diff --git a/src/schema/rules/files/atlas/derivatives.yaml b/src/schema/rules/files/atlas/derivatives.yaml
@@ -92,7 +92,7 @@ anat_parametric_discrete_segmentation:
     cohort: optional
     space: optional
     atlas: optional
-    segmentation: option
+    segmentation: optional
     scale: optional
     resolution: optional
     density: optional
@@ -112,7 +112,7 @@ anat_nonparametric_discrete_segmentation:
     cohort: optional
     space: optional
     atlas: optional
-    segmentation: option
+    segmentation: optional
     scale: optional
     resolution: optional
     density: optional
@@ -132,7 +132,7 @@ func_discrete_segmentation:
     cohort: optional
     space: optional
     atlas: optional
-    segmentation: option
+    segmentation: optional
     scale: optional
     resolution: optional
     density: optional
@@ -147,7 +147,7 @@ dwi_discrete_segmentation:
     cohort: optional
     space: optional
     atlas: optional
-    segmentation: option
+    segmentation: optional
     scale: optional
     resolution: optional
     density: optional
@@ -162,7 +162,7 @@ anat_parametric_probabilistic_segmentation:
     cohort: optional
     space: optional
     atlas: optional
-    segmentation: option
+    segmentation: optional
     scale: optional
     resolution: optional
     density: optional
@@ -178,7 +178,7 @@ anat_nonparametric_probabilistic_segmentation:
     cohort: optional
     space: optional
     atlas: optional
-    segmentation: option
+    segmentation: optional
     scale: optional
     resolution: optional
     density: optional
@@ -194,7 +194,7 @@ func_probabilistic_segmentation:
     cohort: optional
     space: optional
     atlas: optional
-    segmentation: option
+    segmentation: optional
     scale: optional
     resolution: optional
     density: optional
@@ -210,7 +210,7 @@ dwi_probabilistic_segmentation:
     cohort: optional
     space: optional
     atlas: optional
-    segmentation: option
+    segmentation: optional
     scale: optional
     resolution: optional
     density: optional
@@ -232,7 +232,7 @@ anat_parametic_discrete_surface:
     cohort: optional
     space: optional
     atlas: optional
-    segmentation: option
+    segmentation: optional
     scale: optional
     resolution: optional
     density: optional
@@ -253,7 +253,7 @@ anat_nonparametic_discrete_surface:
     cohort: optional
     space: optional
     atlas: optional
-    segmentation: option
+    segmentation: optional
     scale: optional
     resolution: optional
     density: optional

diff --git a/src/schema/rules/files/deriv/imaging.yaml b/src/schema/rules/files/deriv/imaging.yaml
@@ -101,7 +101,7 @@ anat_parametric_discrete_segmentation:
     cohort: optional
     space: optional
     atlas: optional
-    segmentation: option
+    segmentation: optional
     scale: optional
     resolution: optional
     density: optional
@@ -121,7 +121,7 @@ anat_nonparametric_discrete_segmentation:
     cohort: optional
     space: optional
     atlas: optional
-    segmentation: option
+    segmentation: optional
     scale: optional
     resolution: optional
     density: optional
@@ -141,7 +141,7 @@ func_discrete_segmentation:
     cohort: optional
     space: optional
     atlas: optional
-    segmentation: option
+    segmentation: optional
     scale: optional
     resolution: optional
     density: optional
@@ -156,7 +156,7 @@ dwi_discrete_segmentation:
     cohort: optional
     space: optional
     atlas: optional
-    segmentation: option
+    segmentation: optional
     scale: optional
     resolution: optional
     density: optional
@@ -171,7 +171,7 @@ anat_parametric_probabilistic_segmentation:
     cohort: optional
     space: optional
     atlas: optional
-    segmentation: option
+    segmentation: optional
     scale: optional
     resolution: optional
     density: optional
@@ -187,7 +187,7 @@ anat_nonparametric_probabilistic_segmentation:
     cohort: optional
     space: optional
     atlas: optional
-    segmentation: option
+    segmentation: optional
     scale: optional
     resolution: optional
     density: optional
@@ -203,7 +203,7 @@ func_probabilistic_segmentation:
     cohort: optional
     space: optional
     atlas: optional
-    segmentation: option
+    segmentation: optional
     scale: optional
     resolution: optional
     density: optional
@@ -219,7 +219,7 @@ dwi_probabilistic_segmentation:
     cohort: optional
     space: optional
     atlas: optional
-    segmentation: option
+    segmentation: optional
     scale: optional
     resolution: optional
     density: optional
@@ -241,7 +241,7 @@ anat_parametic_discrete_surface:
     cohort: optional
     space: optional
     atlas: optional
-    segmentation: option
+    segmentation: optional
     scale: optional
     resolution: optional
     density: optional
@@ -262,7 +262,7 @@ anat_nonparametic_discrete_surface:
     cohort: optional
     space: optional
     atlas: optional
-    segmentation: option
+    segmentation: optional
     scale: optional
     resolution: optional
     density: optional