np-services 0.1.66__py3-none-any.whl → 0.1.68__py3-none-any.whl

np_services/scripts/pretest.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import abc
 import argparse
+import copy
 import contextlib
 import dataclasses
 import functools
@@ -158,9 +159,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]
         
         
@@ -220,14 +223,14 @@ class DynamicRoutingPretest(PretestSession):
     
     def run_script(self, stim: Literal['sound_test', 'mapping', 'task', 'opto', 'optotagging', 'spontaneous', 'spontaneous_rewards']) -> None:
         
-        params = getattr(self, f'{stim.replace(" ", "_")}_params')
+        params = copy.deepcopy(getattr(self, f'{stim.replace(" ", "_")}_params'))
         
         # add mouse and user info for MPE
         params['mouse_id'] = str(self.mouse.id)
         params['user_id'] = 'ben.hardcastle'
         
-        script: str = params['taskScript']
-        params['taskScript'] = (self.task_script_base / script).as_posix()
+        if self.task_script_base not in params['taskScript']:
+            params['taskScript'] = (self.task_script_base / params['taskScript']).as_posix()
         
         params['maxTrials'] = 30
         
@@ -257,10 +260,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.66.dist-info → np_services-0.1.68.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: np-services
-Version: 0.1.66
+Version: 0.1.68
 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
@@ -15,7 +15,7 @@ Requires-Dist: pandas>=2.0
 Requires-Dist: h5py<4.0.0,>=3.8.0
 Requires-Dist: np-config>=0.4.17
 Requires-Dist: tables<4.0.0,>=3.8.0
-Requires-Dist: npc-sync>=0.1.6
+Requires-Dist: npc-sync>=0.1.13
 Requires-Dist: npc-ephys>=0.1.7
 Requires-Dist: npc-stim>=0.1.5
 Requires-Dist: npc-mvr>=0.1.2

{np_services-0.1.66.dist-info → np_services-0.1.68.dist-info}/RECORD

@@ -1,6 +1,6 @@
-np_services-0.1.66.dist-info/METADATA,sha256=SF2uCzg4P9DR9sS3dEh_hXFzoNoe9yfAX3L0OUj1Qp0,879
-np_services-0.1.66.dist-info/WHEEL,sha256=N2J68yzZqJh3mI_Wg92rwhw0rtJDFpZj9bwQIMJgaVg,90
-np_services-0.1.66.dist-info/entry_points.txt,sha256=TldbYj9M3gsdasFZbDnfhCa-fm5kPiMDXcOj21Qoawk,62
+np_services-0.1.68.dist-info/METADATA,sha256=OgWrVEjcTs9lYB93HFoe3k-7PHNWsFSfzjj28en1IXQ,880
+np_services-0.1.68.dist-info/WHEEL,sha256=vnE8JVcI2Wz7GRKorsPArnBdnW2SWKWGow5gu5tHlRU,90
+np_services-0.1.68.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=VNS2wgoAACI1H8_0yG6qGP9OqRI6Wgjr8l_YoZEQMoY,14220
+np_services/scripts/pretest.py,sha256=nBnNYNpDZYavse6ksH_-fu-LtfWyG-K6rwDx8yrJIUg,14638
 np_services/stim_computer_theme_changer.py,sha256=ypUWS6FZICpZta4GmtTMmgNvw9Sms-cAKv0WZDzFln4,2034
 np_services/utils.py,sha256=VoCRLg7AGcv0qogMQF1-cBq1dWMOlKURotCwW7PKsns,5770
-np_services-0.1.66.dist-info/RECORD,,
+np_services-0.1.68.dist-info/RECORD,,

{np_services-0.1.66.dist-info → np_services-0.1.68.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: pdm-backend (2.1.8)
+Generator: pdm-backend (2.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any