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

Author: effigies

src/schema/meta/associations.yaml

@@ -14,7 +14,6 @@
 ---
 events:
   selectors:
-    - '"task" in entities'
     - extension != '.json'
   target:
     suffix: events

src/schema/meta/expression_tests.yaml

@@ -139,6 +139,10 @@
   result: -1
 - expression: max([-1, "n/a", 1])
   result: 1
+- expression: min(42)
+  result: 42
+- expression: max(42)
+  result: 42
 - expression: '[3, 2, 1][0]'
   result: 3
 - expression: '"string"[0]'

src/schema/rules/checks/asl.yaml

@@ -201,16 +201,18 @@ ASLTotalAcquiredPairsASLContextLength:
     code: TOTAL_ACQUIRED_VOLUMES_NOT_CONSISTENT
     message: |
       The number of values for 'TotalAcquiredPairs' for this file does not match number of
-      volumes in the associated 'aslcontext.tsv'.
-      'TotalAcquiredPairs' is the original number of 3D volumes acquired for each volume defined in the
-      associated 'aslcontext.tsv'.
+      control-label pairs in the associated 'aslcontext.tsv'.
+      'TotalAcquiredPairs' is the original number of control-label pairs
+      defined in the associated 'aslcontext.tsv'.
     level: warning
   selectors:
     - suffix == "asl"
     - type(associations.aslcontext) != "null"
     - '"TotalAcquiredPairs" in sidecar'
+    - count(associations.aslcontext.volume_type, "control") > 0
   checks:
-    - aslcontext.n_rows == sidecar.TotalAcquiredPairs
+    - count(associations.aslcontext.volume_type, "control") == sidecar.TotalAcquiredPairs
+    - count(associations.aslcontext.volume_type, "label") == sidecar.TotalAcquiredPairs
 
 # 184
 PostLabelingDelayGreater:
@@ -223,7 +225,7 @@ PostLabelingDelayGreater:
     - suffix == "asl"
     - sidecar.PostLabelingDelay != null
   checks:
-    - sidecar.PostLabelingDelay <= 10
+    - max(sidecar.PostLabelingDelay) <= 10
 
 # 186
 BolusCutOffDelayTimeGreater:
@@ -235,7 +237,7 @@ BolusCutOffDelayTimeGreater:
   selectors:
     - sidecar.BolusCutOffDelayTime != null
   checks:
-    - sidecar.BolusCutOffDelayTime <= 10
+    - max(sidecar.BolusCutOffDelayTime) <= 10
 
 # 187
 LabelingDurationGreater:
@@ -247,7 +249,7 @@ LabelingDurationGreater:
   selectors:
     - sidecar.LabelingDuration != null
   checks:
-    - sidecar.LabelingDuration <= 10
+    - max(sidecar.LabelingDuration) <= 10
 
 # 196
 ASLEchoTimeASLContextLength:

src/schema/rules/checks/mri.yaml

@@ -23,7 +23,7 @@ EchoTimeGreaterThan:
     - modality == "mri"
     - sidecar.EchoTime
   checks:
-    - sidecar.EchoTime <= 1
+    - max(sidecar.EchoTime) <= 1
 
 # 5
 TotalReadoutTimeGreaterThan: