Merge pull request #366 from ttngu207/dev_social03

feat: update devices schema for social 0.3 ingestion
SainsburyWellcomeCentre · Jun 12, 2024 · 3b73245 · 3b73245
2 parents f9ae80a + 8596bc4
commit 3b73245
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 3 deletions.
diff --git a/aeon/schema/schemas.py b/aeon/schema/schemas.py
@@ -2,7 +2,7 @@
 
 import aeon.schema.core as stream
 from aeon.schema.streams import Device
-from aeon.schema import foraging, octagon, social_01, social_02
+from aeon.schema import foraging, octagon, social_01, social_02, social_03
 
 
 exp02 = DotMap(
@@ -63,7 +63,7 @@
     [
         Device("Metadata", stream.Metadata),
         Device("Environment", social_02.Environment, social_02.SubjectData),
-        Device("CameraTop", stream.Video, social_02.Pose),
+        Device("CameraTop", stream.Video, social_01.Pose),
         Device("CameraNorth", stream.Video),
         Device("CameraSouth", stream.Video),
         Device("CameraEast", stream.Video),
@@ -113,4 +113,35 @@
 )
 
 
-__all__ = ["exp01", "exp02", "octagon01", "social01", "social02"]
+social03 = DotMap(
+    [
+        Device("Metadata", stream.Metadata),
+        Device("Environment", social_02.Environment, social_02.SubjectData),
+        Device("CameraTop", stream.Video, social_03.Pose),
+        Device("CameraNorth", stream.Video),
+        Device("CameraSouth", stream.Video),
+        Device("CameraEast", stream.Video),
+        Device("CameraWest", stream.Video),
+        Device("CameraNest", stream.Video),
+        Device("CameraPatch1", stream.Video),
+        Device("CameraPatch2", stream.Video),
+        Device("CameraPatch3", stream.Video),
+        Device("Nest", social_02.WeightRaw, social_02.WeightFiltered),
+        Device("Patch1", social_02.Patch),
+        Device("Patch2", social_02.Patch),
+        Device("Patch3", social_02.Patch),
+        Device("PatchDummy1", social_02.Patch),
+        Device("NestRfid1", social_02.RfidEvents),
+        Device("NestRfid2", social_02.RfidEvents),
+        Device("GateRfid", social_02.RfidEvents),
+        Device("GateEastRfid", social_02.RfidEvents),
+        Device("GateWestRfid", social_02.RfidEvents),
+        Device("Patch1Rfid", social_02.RfidEvents),
+        Device("Patch2Rfid", social_02.RfidEvents),
+        Device("Patch3Rfid", social_02.RfidEvents),
+        Device("PatchDummy1Rfid", social_02.RfidEvents),
+    ]
+)
+
+
+__all__ = ["exp01", "exp02", "octagon01", "social01", "social02", "social03"]
diff --git a/aeon/schema/social_01.py b/aeon/schema/social_01.py
@@ -10,3 +10,9 @@ def __init__(self, path):
             path = path.replace("Events", "")
 
         super().__init__(_reader.Harp(f"RfidEvents{path}_32*", ["rfid"]))
+
+
+class Pose(Stream):
+
+    def __init__(self, path):
+        super().__init__(_reader.Pose(f"{path}_node-0*"))
diff --git a/aeon/schema/social_03.py b/aeon/schema/social_03.py
@@ -0,0 +1,8 @@
+import aeon.io.reader as _reader
+from aeon.schema.streams import Stream
+
+
+class Pose(Stream):
+
+    def __init__(self, path):
+        super().__init__(_reader.Pose(f"{path}_202_*"))