np-services 0.1.65__py3-none-any.whl → 0.1.67__py3-none-any.whl

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')

{np_services-0.1.65.dist-info → np_services-0.1.67.dist-info}/METADATA

@@ -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.dist-info → np_services-0.1.67.dist-info}/RECORD

@@ -1,6 +1,6 @@
-np_services-0.1.65.dist-info/METADATA,sha256=PD7RsX_QeowMvl35SWCAfSAi8feV5w9yuSKGCoSszY0,879
-np_services-0.1.65.dist-info/WHEEL,sha256=N2J68yzZqJh3mI_Wg92rwhw0rtJDFpZj9bwQIMJgaVg,90
-np_services-0.1.65.dist-info/entry_points.txt,sha256=TldbYj9M3gsdasFZbDnfhCa-fm5kPiMDXcOj21Qoawk,62
+np_services-0.1.67.dist-info/METADATA,sha256=glAO-ZEXfv8mIsxorj09Tmtg9EpmmzIs72mHLOPYkUs,879
+np_services-0.1.67.dist-info/WHEEL,sha256=N2J68yzZqJh3mI_Wg92rwhw0rtJDFpZj9bwQIMJgaVg,90
+np_services-0.1.67.dist-info/entry_points.txt,sha256=TldbYj9M3gsdasFZbDnfhCa-fm5kPiMDXcOj21Qoawk,62
 np_services/.mypy_cache/.gitignore,sha256=_7s5RkPBEvI1a7XzGE6V4z_XMhRokvTu6tEml1Vw_zk,36
 np_services/.mypy_cache/3.9/@plugins_snapshot.json,sha256=RBNvo1WzZ4oRRq0W9-hknpT7T8If536DEMBg9hyq_4o,2
 np_services/.mypy_cache/3.9/__future__.data.json,sha256=raQSzDEsSFGbpuXnjSoGWTF3ufScHYT4VgkTwlfTX3s,8382
@@ -200,7 +200,7 @@ np_services/resources/grey_desktop.ps1,sha256=dKv_J7o3rmV6kLwhtIJA-kJSP1jOOp_Yxq
 np_services/resources/mvr_connector.py,sha256=ZcZYtdtxMyOwoZzGiH2Xh2vllRzcgr6nhNiuYOkbPHM,8230
 np_services/resources/reset_desktop.ps1,sha256=x37x6upJs6F4w47pOmtBMJ9L9b3S_g7zFyb7wd_7ASA,2219
 np_services/resources/zro.py,sha256=eAtKB1h3rFXd-EfGuXFNjtkDMC_9e6ZDA_mzIUjze-g,10246
-np_services/scripts/pretest.py,sha256=kYtJfF-kVC7aR2Qt9CfRo-9O9SU8oHBgLwqfwAIYf3U,14130
+np_services/scripts/pretest.py,sha256=biHyPtguBpsBvzgoyUbwn2hifO4DPn_XxIEa7CtRq7c,14573
 np_services/stim_computer_theme_changer.py,sha256=ypUWS6FZICpZta4GmtTMmgNvw9Sms-cAKv0WZDzFln4,2034
 np_services/utils.py,sha256=VoCRLg7AGcv0qogMQF1-cBq1dWMOlKURotCwW7PKsns,5770
-np_services-0.1.65.dist-info/RECORD,,
+np_services-0.1.67.dist-info/RECORD,,