Merge remote-tracking branch 'upstream/maint/1.10.0'

Author: effigies

src/schema/meta/expression_tests.yaml

@@ -74,6 +74,14 @@
 # General expressions
 - expression: 1 + 2
   result: 3
+- expression: 1 - 2
+  result: -1
+- expression: 3 * 4
+  result: 12
+- expression: 3 / 2
+  result: 1.5
+- expression: 3 % 2
+  result: 1
 - expression: '"cat" + "dog"'
   result: 'catdog'
 - expression: match('string', '.*')

src/schema/objects/metadata.yaml

@@ -609,7 +609,7 @@ DeidentificationMethodCodeSequence:
   type: array
   items:
     type: object
-    recommended_fields:
+    recommended:
       - CodeValue
       - CodeMeaning
       - CodingSchemeDesignator
@@ -1000,7 +1000,7 @@ EditPulse:
   type: object
   additionalProperties:
     type: object
-    recommended_fields: [FrequencyOffset, PulseDuration]
+    recommended: [FrequencyOffset, PulseDuration]
     properties:
       FrequencyOffset:
         anyOf:

src/schema/rules/checks/func.yaml

@@ -41,9 +41,17 @@ RepetitionTimeMismatch:
     - type(sidecar.RepetitionTime) != "null"
     - type(nifti_header) != "null"
   checks:
-    # Implement millisecond rounding via AND
-    - sidecar.RepetitionTime - nifti_header.pixdim[4] < 0.001
-    - sidecar.RepetitionTime - nifti_header.pixdim[4] > -0.001
+    # Use index(...) % 3 to treat unknown units like seconds
+    - |
+      nifti_header.pixdim[4]
+        * 10 ** (-3 * (index(["sec", "msec", "usec", "unknown"], nifti_header.xyzt_units.t) % 3))
+      - sidecar.RepetitionTime
+      > -0.001
+    - |
+      nifti_header.pixdim[4]
+        * 10 ** (-3 * (index(["sec", "msec", "usec", "unknown"], nifti_header.xyzt_units.t) % 3))
+      - sidecar.RepetitionTime
+      < 0.001
 
 # 54
 BoldNot4d:

tools/schemacode/src/bidsschematools/expressions.py

@@ -62,7 +62,7 @@ def parse(expression_string: str) -> "ASTNode":
 notOp = Literal("!")
 compOp = one_of(("==", "!=", "<", "<=", ">", ">=", "in"))
 addOp = one_of(("+", "-"))
-mulOp = one_of(("*", "/"))
+mulOp = one_of(("*", "/", "%"))
 expOp = Literal("**")
 
 lpar, rpar = Suppress("("), Suppress(")")