np-services 0.1.65__tar.gz → 0.1.67__tar.gz

{np_services-0.1.65 → np_services-0.1.67}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: np-services
-Version: 0.1.65
+Version: 0.1.67
 Summary: Tools for interfacing with devices and services used in Mindscope Neuropixels experiments at the Allen Institute.
 Author-Email: bjhardcastle <ben.hardcastle@alleninstitute.org>
 Classifier: Programming Language :: Python :: 3

{np_services-0.1.65 → np_services-0.1.67}/pyproject.toml

@@ -18,7 +18,7 @@ dependencies = [
     "npc-mvr>=0.1.2",
 ]
 name = "np-services"
-version = "0.1.65"
+version = "0.1.67"
 description = "Tools for interfacing with devices and services used in Mindscope Neuropixels experiments at the Allen Institute."
 readme = "README.md"
 classifiers = [

{np_services-0.1.65 → np_services-0.1.67}/src/np_services/scripts/pretest.py

@@ -28,7 +28,7 @@ import npc_stim
 logger = logging.getLogger()
 
 DEFAULT_SERVICES: tuple[np_services.Testable, ...] = (np_services.MouseDirector, )
-DEFAULT_RECORDERS: tuple[np_services.Startable, ...] = (np_services.Sync, np_services.OpenEphys, np_services.VideoMVR, )
+DEFAULT_RECORDERS: tuple[np_services.Startable, ...] = (np_services.Sync, np_services.VideoMVR, )
 
 @dataclasses.dataclass
 class PretestConfig:
@@ -49,7 +49,9 @@ class PretestSession(abc.ABC):
         return DEFAULT_SERVICES + self.recorders + (self.stim, )
     
     @property
-    def recorders(self) -> tuple[np_services.Startable, ...]: 
+    def recorders(self) -> tuple[np_services.Startable, ...]:
+        if self.pretest_config.check_barcodes:
+            return DEFAULT_RECORDERS + (np_services.OpenEphys, )
         return DEFAULT_RECORDERS
     
     @property
@@ -156,9 +158,11 @@ class DynamicRoutingPretest(PretestSession):
         
         rig = str(self.rig).replace('.', '')
         locs_root = self.base_path / 'OptoGui' / f'{dirname}'
-        available_locs = sorted(tuple(locs_root.glob(f"{file_prefix}_{self.mouse.id}_{rig}_*")), reverse=True)
+        # use any available locs file - as long as the light switches on the
+        # values don't matter
+        available_locs = sorted(tuple(locs_root.glob(f"{file_prefix}*")), reverse=True)
         if not available_locs:
-            raise FileNotFoundError(f"No optotagging locs found for {self.mouse}/{rig} - have you run OptoGui?")
+            raise FileNotFoundError(f"No optotagging locs found - have you run OptoGui?")
         return available_locs[0]
         
         
@@ -255,10 +259,14 @@ class DynamicRoutingPretest(PretestSession):
             self.stim.finalize()
             
     def run_pretest_stim(self) -> None:
-        self.run_script('sound_test')
-        if self.pretest_config.check_opto:
-            self.run_script('optotagging')
-            
+        if self.pretest_config.check_audio:
+            print("Starting audio test - check for sound...", end="", flush=True)
+            self.run_script('sound_test')
+            print(" done")
+        print("Starting stim - check for opto, spin wheel and tap lick spout...", end="", flush=True)
+        self.run_script('optotagging') # vis stim with opto (for checking vsyncs, running,  )
+        print(" done")
+        
     def configure_services(self) -> None:
         self.stim.script = '//allen/programs/mindscope/workgroups/dynamicrouting/DynamicRoutingTask/runTask.py'
         self.stim.data_root = pathlib.Path('//allen/programs/mindscope/workgroups/dynamicrouting/DynamicRoutingTask/Data/366122')