Merge pull request #1941 from effigies/fix/schema-checks

[SCHEMA] Fixes identified from reviewing OpenNeuro errors
bids-standard · Oct 10, 2024 · 9a2145c · 9a2145c
2 parents 4b71e3a + c1200b5
commit 9a2145c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/schema/rules/checks/mri.yaml b/src/schema/rules/checks/mri.yaml
@@ -109,7 +109,7 @@ BolusCutOffDelayTimeNotMonotonicallyIncreasing:
     level: error
   selectors:
     - modality == "mri"
-    - sidecar.BolusCutOffDelayTime != null
+    - type(sidecar.BolusCutOffDelayTime) == 'array'
   checks:
     - allequal(sorted(sidecar.BolusCutOffDelayTime), sidecar.BolusCutOffDelayTime)
 

diff --git a/src/schema/rules/sidecars/entity_rules.yaml b/src/schema/rules/sidecars/entity_rules.yaml
@@ -10,7 +10,7 @@
 EntitiesTaskMetadata:
   selectors:
     - '"task" in entities'
-    - suffix != 'events'
+    - '!intersects([suffix], ["events", "channels", "markers"])'
   fields:
     TaskName: recommended
 

diff --git a/src/schema/rules/sidecars/mri.yaml b/src/schema/rules/sidecars/mri.yaml
@@ -195,8 +195,9 @@ PhaseEncodingDirectionRec:
 
 PhaseEncodingDirectionReq:
   selectors:
-    - modality == "mri"
+    - datatype == "fmap"
     - suffix == "epi"
+    - match(extension, "^\.nii(\.gz)?$")
   fields:
     PhaseEncodingDirection:
       level: required
@@ -244,6 +245,7 @@ SliceTimingMRI:
   selectors:
     - modality == "mri"
     - sidecar.MRAcquisitionType == "2D"
+    - match(extension, "^\.nii(\.gz)?$")
   fields:
     SliceTiming:
       level: recommended
@@ -257,6 +259,7 @@ SliceTimingASL:
     - datatype == "perf"
     - intersects([suffix], ["asl", "m0scan"])
     - sidecar.MRAcquisitionType == "2D"
+    - match(extension, "^\.nii(\.gz)?$")
   fields:
     SliceTiming:
       level: required
@@ -288,6 +291,7 @@ MRIFlipAngleLookLockerFalse:
   selectors:
     - modality == "mri"
     - sidecar.LookLocker != true
+    - match(extension, "^\.nii(\.gz)?$")
   fields:
     FlipAngle:
       level: recommended
@@ -304,6 +308,7 @@ MRIFlipAngleLookLockerTrue:
   selectors:
     - modality == "mri"
     - sidecar.LookLocker == true
+    - match(extension, "^\.nii(\.gz)?$")
   fields:
     FlipAngle:
       level: required
@@ -377,6 +382,7 @@ MRIInstitutionInformation:
 DeidentificationMethod:
   selectors:
     - intersects([modality], ["mri", "pet"])
+    - match(extension, "^\.nii(\.gz)?$")
   fields:
     DeidentificationMethod:
       level: optional