Merge pull request #1560 from effigies/enh/asl_physio

ENH: Add physio/stim files to ASL and PET rules
bids-standard · Nov 14, 2022 · 97feb8b · 97feb8b
2 parents 774fab9 + db5e9b9
commit 97feb8b
Showing 1 changed file with 27 additions and 15 deletions.
diff --git a/bids-validator/bids_validator/rules/file_level_rules.json b/bids-validator/bids_validator/rules/file_level_rules.json
@@ -302,17 +302,23 @@
   },
 
   "asl": {
-    "regexp": "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?perf[\\/\\\\]\\1(_\\2)?(?:_acq-[a-zA-Z0-9]+)?(?:_rec-[a-zA-Z0-9]+)?(?:_dir-[a-zA-Z0-9]+)?(?:_run-[0-9]+)?_(?:@@@_asl_type_@@@)$",
+    "regexp": "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?perf[\\/\\\\]\\1(_\\2)?(?:_acq-[a-zA-Z0-9]+)?(?:_rec-[a-zA-Z0-9]+)?(?:_dir-[a-zA-Z0-9]+)?(?:_run-[0-9]+)?(?:(?:@@@_asl_type_@@@)|(?:_recording-[a-zA-Z0-9]+)?(?:@@@_cont_ext_@@@))$",
     "tokens": {
       "@@@_asl_type_@@@": [
-        "asl\\.nii\\.gz",
-        "asl\\.nii",
-        "asl\\.json",
-        "m0scan\\.nii\\.gz",
-        "m0scan\\.nii",
-        "m0scan\\.json",
-        "aslcontext\\.tsv",
-        "asllabeling\\.jpg"
+        "_asl\\.nii\\.gz",
+        "_asl\\.nii",
+        "_asl\\.json",
+        "_m0scan\\.nii\\.gz",
+        "_m0scan\\.nii",
+        "_m0scan\\.json",
+        "_aslcontext\\.tsv",
+        "_asllabeling\\.jpg"
+      ],
+      "@@@_cont_ext_@@@": [
+        "_physio\\.tsv\\.gz",
+        "_stim\\.tsv\\.gz",
+        "_physio\\.json",
+        "_stim\\.json"
       ]
     }
   },
@@ -532,14 +538,20 @@
   },
 
   "pet": {
-    "regexp": "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?pet[\\/\\\\](sub-[a-zA-Z0-9]+)(?:(_ses-[a-zA-Z0-9]+))?(?:_task-[a-zA-Z0-9]+)?(?:_trc-[a-zA-Z0-9]+)?(?:_rec-[a-zA-Z0-9]+)?(?:_run-[0-9]+)?_(@@@_pet_ext_@@@)$",
+    "regexp": "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?pet[\\/\\\\](sub-[a-zA-Z0-9]+)(?:(_ses-[a-zA-Z0-9]+))?(?:_task-[a-zA-Z0-9]+)?(?:_trc-[a-zA-Z0-9]+)?(?:_rec-[a-zA-Z0-9]+)?(?:_run-[0-9]+)?(?:(?:@@@_pet_ext_@@@)|(?:_recording-[a-zA-Z0-9]+)?(?:@@@_cont_ext_@@@))$",
     "tokens": {
       "@@@_pet_ext_@@@": [
-        "pet\\.nii\\.gz",
-        "pet\\.nii",
-        "pet\\.json",
-        "events\\.json",
-        "events\\.tsv"
+        "_pet\\.nii\\.gz",
+        "_pet\\.nii",
+        "_pet\\.json",
+        "_events\\.json",
+        "_events\\.tsv"
+      ],
+      "@@@_cont_ext_@@@": [
+        "_physio\\.tsv\\.gz",
+        "_stim\\.tsv\\.gz",
+        "_physio\\.json",
+        "_stim\\.json"
       ]
     }
   },