SCHEMA: Fix diffusion and NIRS rules (#1650)

* SCHEMA: Check for three bvec rows

* FIX: NIRS channels are recommended, not required

* FIX: Selectors to match required/optional conditions

* FIX: Value of channel type is ACCEL, not ACC

src/schema/rules/checks/dwi.yaml

@@ -41,7 +41,7 @@ DWIBvecRows:
     - suffix == "dwi"
     - '"bvec" in associations'
   checks:
-    - associations.bvec.n_rows == 1
+    - associations.bvec.n_rows == 3
 
 # 32
 DWIMissingBvec:

src/schema/rules/checks/nirs.yaml

@@ -23,24 +23,28 @@ NIRSChannelCount:
 ACCELChannelCountReq:
   selectors:
     - suffix == "nirs"
+    - count(associations.channels.type, "ACCEL") > 0
   checks:
     - sidecar.ACCELChannelCount == count(associations.channels.type, "ACCEL")
 
 GYROChannelCountReq:
   selectors:
     - suffix == "nirs"
+    - count(associations.channels.type, "GYRO") > 0
   checks:
     - sidecar.GYROChannelCount == count(associations.channels.type, "GYRO")
 
 MAGNChannelCountReq:
   selectors:
     - suffix == "nirs"
+    - count(associations.channels.type, "MAGN") > 0
   checks:
     - sidecar.MAGNChannelCount == count(associations.channels.type, "MAGN")
 
 ShortChannelCountReq:
   selectors:
     - suffix == "nirs"
+    - '"ShortChannelCount" in sidecar'
   checks:
     - sidecar.ShortChannelCount == count(associations.channels.short_channel, "true")
 
@@ -53,11 +57,15 @@ Component:
   checks:
     - columns.component != null
 
-RequiredChannels:
+RecommendedChannels:
+  issue:
+    code: NIRS_RECOMMENDED_CHANNELS
+    message: |
+      NIRS files SHOULD have an associated channels.tsv file.
+    level: warning
   selectors:
-    - datatype == "nirs"
-    - suffix == "optodes"
-    - extension == ".tsv"
+    - suffix == "nirs"
+    - extension == ".snirf"
   checks:
     - associations.channels != null
 

src/schema/rules/sidecars/nirs.yaml

@@ -149,7 +149,7 @@ NirsRequired:
     # Following counts required conditions enforced in checks
     ACCELChannelCount:
       level: optional
-      level_addendum: required if any channel type is ACC
+      level_addendum: required if any channel type is ACCEL
     GYROChannelCount:
       level: optional
       level_addendum: required if any channel type is GYRO