From 1d4228dcf40a95de89c9fb7b8d3e01dc165c0c27 Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Tue, 11 Aug 2020 23:58:12 +0200 Subject: [PATCH] adjusted imports to merged laser timing file --- slic/devices/general/__init__.py | 1 - slic/devices/loptics/alvra_experiment.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/slic/devices/general/__init__.py b/slic/devices/general/__init__.py index d38e2067..88b00b7b 100644 --- a/slic/devices/general/__init__.py +++ b/slic/devices/general/__init__.py @@ -1,5 +1,4 @@ -from . import alvra_timing from . import motor from . import smaract from . import delay_stage diff --git a/slic/devices/loptics/alvra_experiment.py b/slic/devices/loptics/alvra_experiment.py index 0ab9975f..80053f7c 100755 --- a/slic/devices/loptics/alvra_experiment.py +++ b/slic/devices/loptics/alvra_experiment.py @@ -4,7 +4,7 @@ from slic.utils.printing import printable_dict from slic.devices.general.motor import Motor from ..basedevice import BaseDevice from ..general.delay_stage import DelayStage -from ..timing.alvralasertiming import eTiming +from ..timing.lasertiming import eTiming class LaserExp(BaseDevice):