Skip to content

Commit 5e5a5b9

Browse files
committed
Fix services for DR sessions
1 parent c489e76 commit 5e5a5b9

File tree

3 files changed

+2
-26
lines changed

3 files changed

+2
-26
lines changed

src/np_workflows/experiments/dynamic_routing/main.py

-5
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ def __init__(self, *args, **kwargs):
7777
MouseDirector,
7878
Sync,
7979
VideoMVR,
80-
self.imager,
81-
NewScaleCoordinateRecorder,
8280
ScriptCamstim,
8381
)
8482
super().__init__(*args, **kwargs)
@@ -89,8 +87,6 @@ def __init__(self, *args, **kwargs):
8987
MouseDirector,
9088
Sync,
9189
VideoMVR,
92-
self.imager,
93-
NewScaleCoordinateRecorder,
9490
ScriptCamstim,
9591
)
9692
super().__init__(*args, **kwargs)
@@ -102,7 +98,6 @@ def __init__(self, *args, **kwargs):
10298
MouseDirector,
10399
Sync,
104100
VideoMVR,
105-
self.imager,
106101
NewScaleCoordinateRecorder,
107102
ScriptCamstim,
108103
OpenEphys,

src/np_workflows/shared/base_experiments.py

+1-20
Original file line numberDiff line numberDiff line change
@@ -555,25 +555,6 @@ def recorders(self) -> tuple[Service, ...]:
555555
if self.is_ephys:
556556
return (np_services.Sync, np_services.VideoMVR, np_services.OpenEphys)
557557
return (np_services.Sync, np_services.VideoMVR)
558-
559-
@property
560-
def services(self) -> tuple[Service, ...]:
561-
"""All services"""
562-
if self.is_ephys:
563-
return (
564-
np_services.Sync,
565-
np_services.VideoMVR,
566-
np_services.OpenEphys,
567-
np_services.NewScaleCoordinateRecorder,
568-
np_services.ScriptCamstim,
569-
np_services.MouseDirector,
570-
)
571-
return (
572-
np_services.Sync,
573-
np_services.VideoMVR,
574-
np_services.ScriptCamstim,
575-
np_services.MouseDirector,
576-
)
577558

578559

579560
@property
@@ -620,7 +601,7 @@ def get_latest_optogui_txt(self, opto_or_optotagging: Literal['opto', 'optotaggi
620601
dirname = dict(opto='optoParams', optotagging='optotagging')[opto_or_optotagging]
621602
file_prefix = dirname
622603

623-
rig = str(self.rig).replace('.', '')
604+
rig = str(self.rig).replace('.', '')def
624605
locs_root = self.base_path / 'OptoGui' / f'{dirname}'
625606
available_locs = sorted(tuple(locs_root.glob(f"{file_prefix}_{self.mouse.id}_{rig}_*")), reverse=True)
626607
if not available_locs:

0 commit comments

Comments
 (0)