Merge pull request #319 from ttngu207/datajoint_social01

SubjectState is not a reliable indication of subjects in the block, use identities from SLEAP data
SainsburyWellcomeCentre · Feb 2, 2024 · 27259a2 · 27259a2
2 parents 6a3f287 + d8273ba
commit 27259a2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/aeon/dj_pipeline/analysis/block_analysis.py b/aeon/dj_pipeline/analysis/block_analysis.py
@@ -140,10 +140,9 @@ def make(self, key):
             )
 
         # Subject data
-        subject_events_query = acquisition.Environment.SubjectState & key & chunk_restriction
-        subject_events_df = fetch_stream(subject_events_query)
-
-        subject_names = set(subject_events_df.id)
+        subject_names = set(
+            (tracking.SLEAPTracking.PoseIdentity & key & chunk_restriction).fetch("identity_name")
+        )
         for subject_name in subject_names:
             # positions - query for CameraTop, identity_name matches subject_name,
             pos_query = (

diff --git a/aeon/schema/social.py b/aeon/schema/social.py
@@ -110,4 +110,4 @@ def rfid_events_social01_b(pattern):
 
 def rfid_events_b(pattern):
     """RFID events reader"""
-    return {"RfidEvents": reader.Harp(f"{pattern}Events_*", ["rfid"])}
+    return {"RfidEvents": reader.Harp(f"{pattern}_32*", ["rfid"])}