Merge branch 'social_schema' into datajoint_social01

SainsburyWellcomeCentre · Jan 19, 2024 · ae0110a · ae0110a
2 parents 09b3852 + f259232
commit ae0110a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/aeon/schema/schemas.py b/aeon/schema/schemas.py
@@ -59,7 +59,7 @@
 social01 = DotMap(
     [
         Device("Metadata", core.metadata),
-        Device("ExperimentalMetadata", social.environment_b, social.subject_b),
+        Device("Environment", social.environment_b, social.subject_b),
         Device("CameraTop", core.video, social.camera_top_pos_b),
         Device("CameraNorth", core.video),
         Device("CameraSouth", core.video),

diff --git a/aeon/schema/social.py b/aeon/schema/social.py
@@ -35,7 +35,7 @@
 
 # LightEvents
 light_events_b = lambda pattern: {
-    "LightEvents": reader.Csv("Environment_LightEvents_*", ["channel", "value"])
+    "LightEvents": reader.Csv(f"{pattern}_LightEvents_*", ["channel", "value"])
 }
 
 # Combine EnvironmentState, BlockState, LightEvents
@@ -45,18 +45,18 @@
 
 # SubjectState
 subject_state_b = lambda pattern: {
-    "SubjectState": reader.Csv("Environment_SubjectState_*", ["id", "weight", "type"])
+    "SubjectState": reader.Csv(f"{pattern}_SubjectState_*", ["id", "weight", "type"])
 }
 
 # SubjectVisits
 subject_visits_b = lambda pattern: {
-    "SubjectVisits": reader.Csv("Environment_SubjectVisit_*", ["id", "type", "region"])
+    "SubjectVisits": reader.Csv(f"{pattern}_SubjectVisit_*", ["id", "type", "region"])
 }
 
 # SubjectWeight
 subject_weight_b = lambda pattern: {
     "SubjectWeight": reader.Csv(
-        "Environment_SubjectWeight_*", ["weight", "confidence", "subject_id", "int_id"]
+        f"{pattern}_SubjectWeight_*", ["weight", "confidence", "subject_id", "int_id"]
     )
 }