From 82e19c73a9aaa82fcd50271619703755353184a4 Mon Sep 17 00:00:00 2001
From: Stefan Appelhoff <stefan.appelhoff@mailbox.org>
Date: Thu, 19 Nov 2020 17:56:23 +0100
Subject: [PATCH 1/5] [FIX] make acq entity optional for eeg, meg, ieeg,
 channels

Co-authored-by: Gio Piantoni <github@gpiantoni.com>
---
 src/04-modality-specific-files/02-magnetoencephalography.md | 6 +++---
 src/04-modality-specific-files/03-electroencephalography.md | 6 +++---
 .../04-intracranial-electroencephalography.md               | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/04-modality-specific-files/02-magnetoencephalography.md b/src/04-modality-specific-files/02-magnetoencephalography.md
index c605eb86c6..3b96939759 100644
--- a/src/04-modality-specific-files/02-magnetoencephalography.md
+++ b/src/04-modality-specific-files/02-magnetoencephalography.md
@@ -14,8 +14,8 @@ Template:
 sub-<label>/
     [ses-<label>]/
       meg/
-        sub-<label>[_ses-<label>]_task-<label>[_run-<index>][_proc-<label>]_meg.<manufacturer_specific_extension>
-        [sub-<label>[_ses-<label>]_task-<label>[_run-<index>][_proc-<label>]_meg.json]
+        sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>][_proc-<label>]_meg.<manufacturer_specific_extension>
+        [sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>][_proc-<label>]_meg.json]
 ```
 
 Unprocessed MEG data MUST be stored in the native file format of the MEG
@@ -195,7 +195,7 @@ Template:
 sub-<label>/
     [ses-<label>]/
       meg/
-        [sub-<label>[_ses-<label>]_task-<label>[_run-<index>][_proc-<label>]_channels.tsv]
+        [sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>][_proc-<label>]_channels.tsv]
 ```
 
 This file is RECOMMENDED as it provides easily searchable information across
diff --git a/src/04-modality-specific-files/03-electroencephalography.md b/src/04-modality-specific-files/03-electroencephalography.md
index cddceaa8e4..66ba81a687 100644
--- a/src/04-modality-specific-files/03-electroencephalography.md
+++ b/src/04-modality-specific-files/03-electroencephalography.md
@@ -23,8 +23,8 @@ Template:
 sub-<label>/
     [ses-<label>]/
       eeg/
-        sub-<label>[_ses-<label>]_task-<label>[_run-<index>]_eeg.<manufacturer_specific_extension>
-        sub-<label>[_ses-<label>]_task-<label>[_run-<index>]_eeg.json
+        sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>]_eeg.<manufacturer_specific_extension>
+        sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>]_eeg.json
 ```
 
 The EEG community uses a variety of formats for storing raw data, and there is
@@ -197,7 +197,7 @@ Template:
 sub-<label>/
     [ses-<label>]/
       eeg/
-        [sub-<label>[_ses-<label>]_task-<label>[_run-<index>]_channels.tsv]
+        [sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>]_channels.tsv]
 ```
 
 This file is RECOMMENDED as it provides easily searchable information across
diff --git a/src/04-modality-specific-files/04-intracranial-electroencephalography.md b/src/04-modality-specific-files/04-intracranial-electroencephalography.md
index ae5c88682d..6b83ddac25 100644
--- a/src/04-modality-specific-files/04-intracranial-electroencephalography.md
+++ b/src/04-modality-specific-files/04-intracranial-electroencephalography.md
@@ -14,8 +14,8 @@ Template:
 sub-<label>/
   [ses-<label>]/
     ieeg/
-      sub-<label>[_ses-<label>]_task-<label>[_run-<index>]_ieeg.<manufacturer_specific_extension>
-      sub-<label>[_ses-<label>]_task-<label>[_run-<index>]_ieeg.json
+      sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>]_ieeg.<manufacturer_specific_extension>
+      sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>]_ieeg.json
 ```
 
 The iEEG community uses a variety of formats for storing raw data, and there is
@@ -209,7 +209,7 @@ Template:
 sub-<label>/
     [ses-<label>]/
       ieeg/
-        [sub-<label>[_ses-<label>]_task-<label>[_run-<index>]_channels.tsv]
+        [sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>]_channels.tsv]
 ```
 
 A channel represents one time series recorded with the recording system (for

From 4741b5d054a430394a853be3e25b3e9df8a85eef Mon Sep 17 00:00:00 2001
From: Stefan Appelhoff <stefan.appelhoff@mailbox.org>
Date: Thu, 19 Nov 2020 18:00:34 +0100
Subject: [PATCH 2/5] add channels acq optional to schema

---
 src/schema/auxdatatypes/channels.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/schema/auxdatatypes/channels.yaml b/src/schema/auxdatatypes/channels.yaml
index a906208973..f5b4128243 100644
--- a/src/schema/auxdatatypes/channels.yaml
+++ b/src/schema/auxdatatypes/channels.yaml
@@ -12,4 +12,5 @@
     sub: required
     ses: optional
     task: required
+    acq: optional
     run: optional

From 37527d504000f79bafec9417be43af9633912e29 Mon Sep 17 00:00:00 2001
From: Stefan Appelhoff <stefan.appelhoff@mailbox.org>
Date: Thu, 19 Nov 2020 18:07:28 +0100
Subject: [PATCH 3/5] run bids_schema.py

cd tools/
python bids_schema.py entitytable ../src/schema/ ../src/99-appendices/04-entity-table.md
---
 src/99-appendices/04-entity-table.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/99-appendices/04-entity-table.md b/src/99-appendices/04-entity-table.md
index 9f3002bf33..9bdccf3b8f 100644
--- a/src/99-appendices/04-entity-table.md
+++ b/src/99-appendices/04-entity-table.md
@@ -39,7 +39,7 @@ while entity definitions are in [Appendix IX](09-entities.md).
 | meg<br>(meg)               | REQUIRED                            | OPTIONAL                            | REQUIRED                              | OPTIONAL                            | OPTIONAL                            | OPTIONAL                              |                                         | OPTIONAL                                |
 | meg<br>(headshape)         | REQUIRED                            | OPTIONAL                            |                                       | OPTIONAL                            |                                     |                                       | OPTIONAL                                |                                         |
 | meg<br>(markers)           | REQUIRED                            | OPTIONAL                            | OPTIONAL                              | OPTIONAL                            |                                     |                                       | OPTIONAL                                |                                         |
-| channels<br>(meg eeg ieeg) | REQUIRED                            | OPTIONAL                            | REQUIRED                              |                                     | OPTIONAL                            |                                       |                                         |                                         |
+| channels<br>(meg eeg ieeg) | REQUIRED                            | OPTIONAL                            | REQUIRED                              | OPTIONAL                            | OPTIONAL                            |                                       |                                         |                                         |
 | electrodes<br>(eeg ieeg)   | REQUIRED                            | OPTIONAL                            |                                       | OPTIONAL                            |                                     |                                       | OPTIONAL                                |                                         |
 | events<br>(meg eeg ieeg)   | REQUIRED                            | OPTIONAL                            | REQUIRED                              |                                     | OPTIONAL                            |                                       |                                         |                                         |
 | photo<br>(meg eeg ieeg)    | REQUIRED                            | OPTIONAL                            |                                       | OPTIONAL                            |                                     |                                       |                                         |                                         |

From 60484dfef2129bc5459c43e27ae4db3ed781cc2f Mon Sep 17 00:00:00 2001
From: Stefan Appelhoff <stefan.appelhoff@mailbox.org>
Date: Fri, 20 Nov 2020 11:16:18 +0100
Subject: [PATCH 4/5] add events acq optional to schema

---
 src/schema/auxdatatypes/events.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/schema/auxdatatypes/events.yaml b/src/schema/auxdatatypes/events.yaml
index 3c0ec521c1..34a0d79431 100644
--- a/src/schema/auxdatatypes/events.yaml
+++ b/src/schema/auxdatatypes/events.yaml
@@ -12,4 +12,5 @@
     sub: required
     ses: optional
     task: required
+    acq: optional
     run: optional

From 181f5cb1c9c194618f815929026f62652ef4badf Mon Sep 17 00:00:00 2001
From: Stefan Appelhoff <stefan.appelhoff@mailbox.org>
Date: Fri, 20 Nov 2020 11:17:01 +0100
Subject: [PATCH 5/5] run bids_schema.py

cd tools/
python bids_schema.py entitytable ../src/schema/ ../src/99-appendices/04-entity-table.md
---
 src/99-appendices/04-entity-table.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/99-appendices/04-entity-table.md b/src/99-appendices/04-entity-table.md
index 9bdccf3b8f..62ffc7b95c 100644
--- a/src/99-appendices/04-entity-table.md
+++ b/src/99-appendices/04-entity-table.md
@@ -41,7 +41,7 @@ while entity definitions are in [Appendix IX](09-entities.md).
 | meg<br>(markers)           | REQUIRED                            | OPTIONAL                            | OPTIONAL                              | OPTIONAL                            |                                     |                                       | OPTIONAL                                |                                         |
 | channels<br>(meg eeg ieeg) | REQUIRED                            | OPTIONAL                            | REQUIRED                              | OPTIONAL                            | OPTIONAL                            |                                       |                                         |                                         |
 | electrodes<br>(eeg ieeg)   | REQUIRED                            | OPTIONAL                            |                                       | OPTIONAL                            |                                     |                                       | OPTIONAL                                |                                         |
-| events<br>(meg eeg ieeg)   | REQUIRED                            | OPTIONAL                            | REQUIRED                              |                                     | OPTIONAL                            |                                       |                                         |                                         |
+| events<br>(meg eeg ieeg)   | REQUIRED                            | OPTIONAL                            | REQUIRED                              | OPTIONAL                            | OPTIONAL                            |                                       |                                         |                                         |
 | photo<br>(meg eeg ieeg)    | REQUIRED                            | OPTIONAL                            |                                       | OPTIONAL                            |                                     |                                       |                                         |                                         |
 
 ## Behavioral Data