From 53eebfd55671d1be5ee6987da24ad4389281ae44 Mon Sep 17 00:00:00 2001
From: ld265905 <dorvalloic@gmail.com>
Date: Thu, 25 Jul 2024 15:26:30 +0200
Subject: [PATCH 1/2] modifications on ensemble  eeg and video

---
 caravel/conf/ensemble-eeg_rawdata.conf        |  4 +--
 ...conf => ensemble-videoedited_rawdata.conf} |  5 +---
 caravel/conf/ensemble-videoraw_rawdata.conf   | 27 +++++++++++++++++++
 caravel/info.py                               |  3 ++-
 4 files changed, 32 insertions(+), 7 deletions(-)
 rename caravel/conf/{ensemble-video_rawdata.conf => ensemble-videoedited_rawdata.conf} (86%)
 create mode 100644 caravel/conf/ensemble-videoraw_rawdata.conf

diff --git a/caravel/conf/ensemble-eeg_rawdata.conf b/caravel/conf/ensemble-eeg_rawdata.conf
index 3f9ac82..a65f692 100644
--- a/caravel/conf/ensemble-eeg_rawdata.conf
+++ b/caravel/conf/ensemble-eeg_rawdata.conf
@@ -8,12 +8,12 @@
         },
         {
             "name": "session",
-            "pattern": "ses-(diag|follow)[^a-zA-Z0-9]",
+            "pattern": "ses-(diag|followup)",
             "directory": "{subject}/{session}"
         },
         {
             "name": "acquisition",
-            "pattern": "acq-(aeeg|ceeg)[^a-zA-Z0-9]"
+            "pattern": "acq-(aeeg|ceeg)"
         },
         {
             "name": "run",
diff --git a/caravel/conf/ensemble-video_rawdata.conf b/caravel/conf/ensemble-videoedited_rawdata.conf
similarity index 86%
rename from caravel/conf/ensemble-video_rawdata.conf
rename to caravel/conf/ensemble-videoedited_rawdata.conf
index 1ea8c90..c90c27b 100644
--- a/caravel/conf/ensemble-video_rawdata.conf
+++ b/caravel/conf/ensemble-videoedited_rawdata.conf
@@ -11,10 +11,7 @@
             "pattern": "ses-([a-zA-Z0-9:]+)",
             "directory": "{subject}/{session}"
         },
-        {
-            "name": "run",
-            "pattern": "run-(\\d+)"
-        },
+
         {
             "name": "suffix",
             "pattern": "[._]*([a-zA-Z0-9]*?)\\.[^/\\\\]+$"
diff --git a/caravel/conf/ensemble-videoraw_rawdata.conf b/caravel/conf/ensemble-videoraw_rawdata.conf
new file mode 100644
index 0000000..e18e53e
--- /dev/null
+++ b/caravel/conf/ensemble-videoraw_rawdata.conf
@@ -0,0 +1,27 @@
+{
+    "name": "rawdata",
+    "entities": [
+        {
+            "name": "subject",
+            "pattern": "sub-([a-zA-Z0-9]+)",
+            "directory": "{subject}"
+        },
+        {
+            "name": "session",
+            "pattern": "ses-(term)",
+            "directory": "{subject}/{session}"
+        },
+        {
+            "name": "task",
+            "pattern": "task-([a-zA-Z0-9]+)"
+        },
+        {
+            "name": "suffix",
+            "pattern": "[._]*([a-zA-Z0-9]*?)\\.[^/\\\\]+$"
+        },
+        {
+            "name": "extension",
+            "pattern": "[._]*[a-zA-Z0-9]*?\\.([^/\\\\]+)$"
+        }
+    ]
+}
diff --git a/caravel/info.py b/caravel/info.py
index 900a184..37ef010 100755
--- a/caravel/info.py
+++ b/caravel/info.py
@@ -69,6 +69,7 @@
     "imageio",
     "PyPDF2",
     "vcfpy",
-    "pandas-plink"
+    "pandas-plink",
+    "pyedflib"
 ]
 EXTRA_REQUIRES = {}

From 736b072c6927a0e5df852ee22bc085870243b214 Mon Sep 17 00:00:00 2001
From: ld265905 <dorvalloic@gmail.com>
Date: Tue, 6 Aug 2024 09:57:29 +0200
Subject: [PATCH 2/2] changes from SOPs changes

---
 caravel/conf/ensemble-videoraw_rawdata.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/caravel/conf/ensemble-videoraw_rawdata.conf b/caravel/conf/ensemble-videoraw_rawdata.conf
index e18e53e..e2808f1 100644
--- a/caravel/conf/ensemble-videoraw_rawdata.conf
+++ b/caravel/conf/ensemble-videoraw_rawdata.conf
@@ -8,7 +8,7 @@
         },
         {
             "name": "session",
-            "pattern": "ses-(term)",
+            "pattern": "ses-m([0-9]+)",
             "directory": "{subject}/{session}"
         },
         {