Merge pull request #316 from ttngu207/datajoint_social01

Major cleanup - removing obsolete tables and previous analysis routines - update worker
SainsburyWellcomeCentre · Feb 1, 2024 · 0588cca · 0588cca
2 parents 4d0060a + 456035b
commit 0588cca
Show file tree

Hide file tree

Showing 17 changed files with 172 additions and 1,732 deletions.
diff --git a/aeon/dj_pipeline/acquisition.py b/aeon/dj_pipeline/acquisition.py
diff --git a/aeon/dj_pipeline/analysis/__init__.py b/aeon/dj_pipeline/analysis/__init__.py
@@ -1,3 +0,0 @@
-from .in_arena import *
-from .visit import *
-from .visit_analysis import *

diff --git a/aeon/dj_pipeline/analysis/block_analysis.py b/aeon/dj_pipeline/analysis/block_analysis.py
@@ -10,7 +10,7 @@
 from aeon.dj_pipeline import acquisition, fetch_stream, get_schema_name, streams, tracking
 from aeon.dj_pipeline.analysis.visit import filter_out_maintenance_periods, get_maintenance_periods
 
-schema = dj.schema(get_schema_name("analysis"))
+schema = dj.schema(get_schema_name("block_analysis"))
 
 
 @schema
@@ -316,7 +316,7 @@ def make(self, key):
 @schema
 class BlockDetection(dj.Computed):
     definition = """
-    -> acquisition.Chunk
+    -> acquisition.Environment
     """
 
     def make(self, key):