diff --git a/furka.py b/furka.py index f412772..0c597b5 100644 --- a/furka.py +++ b/furka.py @@ -5,13 +5,13 @@ from slic.core.acquisition import PVAcquisition #from slic.core.acquisition import FakeAcquisition from slic.core.adjustable import PVAdjustable, DummyAdjustable from slic.core.condition import PVCondition +from slic.core.device import SimpleDevice from slic.core.scanner import Scanner from slic.devices.general.delay_stage import DelayStage from slic.devices.general.motor import Motor from slic.devices.general.smaract import SmarActAxis from slic.gui import GUI from slic.utils import devices -from slic.devices.simpledevice import SimpleDevice from slic.utils import as_shortcut, Marker from undulator import Undulators diff --git a/qspace.py b/qspace.py index 75533f1..6c0f38d 100644 --- a/qspace.py +++ b/qspace.py @@ -6,9 +6,8 @@ from diffcalc.hkl.geometry import Position from diffcalc.ub.calc import UBCalculation from slic.core.adjustable import Adjustable, PVAdjustable +from slic.core.device import Device, SimpleDevice from slic.devices.general.motor import Motor -from slic.devices.device import Device -from slic.devices.simpledevice import SimpleDevice from slic.utils.printing import printable_table