diff --git a/slic/devices/endstations/bernina_cameras.py b/slic/devices/endstations/bernina_cameras.py index 76627343..2ce5284c 100644 --- a/slic/devices/endstations/bernina_cameras.py +++ b/slic/devices/endstations/bernina_cameras.py @@ -1,7 +1,7 @@ from slic.core.adjustable import PVAdjustable from slic.devices.general.motor import Motor from slic.devices.general.detectors import CameraCA, CameraBS -from slic.utils.eco_components.aliases import Alias, append_object_to_object +from slic.utils.deprecated.aliases import Alias, append_object_to_object def addMotorToSelf(self, ID=None, name=None): diff --git a/slic/devices/endstations/bernina_diffractometers.py b/slic/devices/endstations/bernina_diffractometers.py index 809ef9d4..568622d8 100644 --- a/slic/devices/endstations/bernina_diffractometers.py +++ b/slic/devices/endstations/bernina_diffractometers.py @@ -1,6 +1,6 @@ from slic.devices.general.motor import Motor from slic.core.adjustable import PVAdjustable -from slic.utils.eco_components.aliases import Alias, append_object_to_object +from slic.utils.deprecated.aliases import Alias, append_object_to_object def addMotorToSelf(self, name=None, ID=None): diff --git a/slic/devices/general/adjustable.py b/slic/devices/general/adjustable.py index dcdf845e..60a0621f 100644 --- a/slic/devices/general/adjustable.py +++ b/slic/devices/general/adjustable.py @@ -1,5 +1,5 @@ from slic.core.task import Task -from slic.utils.eco_components.aliases import Alias +from slic.utils.deprecated.aliases import Alias import colorama import datetime from slic.core.adjustable.convenience import SpecConvenience diff --git a/slic/devices/general/detectors_new.py b/slic/devices/general/detectors_new.py index 597fd65b..dcc638b9 100644 --- a/slic/devices/general/detectors_new.py +++ b/slic/devices/general/detectors_new.py @@ -7,7 +7,7 @@ import h5py import numpy as np from slic.core.task import Task -from slic.utils.eco_components.aliases import Alias +from slic.utils.deprecated.aliases import Alias from slic.utils.hastyepics import get_pv as PV from slic.utils.pyepics import EnumWrapper diff --git a/slic/devices/general/micos_stage.py b/slic/devices/general/micos_stage.py index a38fc748..c489b100 100644 --- a/slic/devices/general/micos_stage.py +++ b/slic/devices/general/micos_stage.py @@ -1,5 +1,5 @@ from slic.devices.general.motor import Motor -from slic.utils.eco_components.aliases import Alias, append_object_to_object +from slic.utils.deprecated.aliases import Alias, append_object_to_object def addMotorToSelf(self, name=None, ID=None): diff --git a/slic/devices/general/motor.py b/slic/devices/general/motor.py index 42ccd3fe..21dbd223 100644 --- a/slic/devices/general/motor.py +++ b/slic/devices/general/motor.py @@ -7,7 +7,7 @@ import numpy as np from slic.core.adjustable import Adjustable, AdjustableError from slic.core.adjustable.convenience import SpecConvenienceProgress from slic.utils.pyepics import EpicsString -from slic.utils.eco_components.aliases import Alias +from slic.utils.deprecated.aliases import Alias from slic.utils.rangebar import RangeBar from slic.utils.hastyepics import Motor as EpicsMotor diff --git a/slic/devices/loptics/bernina_experiment.py b/slic/devices/loptics/bernina_experiment.py index 3ec9c9cd..1ee8578b 100644 --- a/slic/devices/loptics/bernina_experiment.py +++ b/slic/devices/loptics/bernina_experiment.py @@ -1,4 +1,4 @@ -from slic.utils.eco_components.aliases import Alias +from slic.utils.deprecated.aliases import Alias from slic.devices.general.motor import Motor from ..general.smaract import SmarActAxis from ..general.delay_stage import DelayStage diff --git a/slic/devices/xdiagnostics/intensity_monitors_new.py b/slic/devices/xdiagnostics/intensity_monitors_new.py index 7050ee95..5460a49f 100644 --- a/slic/devices/xdiagnostics/intensity_monitors_new.py +++ b/slic/devices/xdiagnostics/intensity_monitors_new.py @@ -2,7 +2,7 @@ import numpy as np from slic.core.adjustable import PVEnumAdjustable from slic.devices.general.motor import Motor from slic.devices.general.detectors_new import FeDigitizer, PvDataStream -from slic.utils.eco_components.aliases import Alias, append_object_to_object +from slic.utils.deprecated.aliases import Alias, append_object_to_object from slic.utils.pyepics import EnumWrapper from slic.utils.hastyepics import get_pv as PV diff --git a/slic/devices/xdiagnostics/profile_monitors_new.py b/slic/devices/xdiagnostics/profile_monitors_new.py index 9b441109..4b33465c 100644 --- a/slic/devices/xdiagnostics/profile_monitors_new.py +++ b/slic/devices/xdiagnostics/profile_monitors_new.py @@ -1,6 +1,6 @@ from slic.devices.general.motor import Motor from slic.devices.general.detectors import CameraCA, CameraBS -from slic.utils.eco_components.aliases import Alias, append_object_to_object +from slic.utils.deprecated.aliases import Alias, append_object_to_object from slic.core.adjustable import PVEnumAdjustable diff --git a/slic/devices/xdiagnostics/timetools.py b/slic/devices/xdiagnostics/timetools.py index c4c34e0b..e77fa3eb 100644 --- a/slic/devices/xdiagnostics/timetools.py +++ b/slic/devices/xdiagnostics/timetools.py @@ -3,7 +3,7 @@ from psen_processing import PsenProcessingClient from slic.devices.general.motor import Motor from slic.devices.general.delay_stage import DelayStage from slic.devices.loptics.bernina_experiment import DelayTime -from slic.utils.eco_components.aliases import Alias, append_object_to_object +from slic.utils.deprecated.aliases import Alias, append_object_to_object class SpectralEncoder: diff --git a/slic/devices/xoptics/attenuator_aramis_new.py b/slic/devices/xoptics/attenuator_aramis_new.py index 2de45c55..39bf7979 100644 --- a/slic/devices/xoptics/attenuator_aramis_new.py +++ b/slic/devices/xoptics/attenuator_aramis_new.py @@ -1,7 +1,7 @@ from time import sleep from slic.devices.general.motor import Motor from slic.core.task import Task -from slic.utils.eco_components.aliases import Alias +from slic.utils.deprecated.aliases import Alias from slic.utils.hastyepics import get_pv as PV diff --git a/slic/devices/xoptics/offset_mirrors.py b/slic/devices/xoptics/offset_mirrors.py index 39f0a652..9affcfe5 100644 --- a/slic/devices/xoptics/offset_mirrors.py +++ b/slic/devices/xoptics/offset_mirrors.py @@ -1,5 +1,5 @@ from slic.devices.general.motor import Motor -from slic.utils.eco_components.aliases import Alias +from slic.utils.deprecated.aliases import Alias def addMotorToSelf(self, name=None, ID=None): diff --git a/slic/devices/xoptics/slits_new.py b/slic/devices/xoptics/slits_new.py index f96a4d6b..047f9821 100644 --- a/slic/devices/xoptics/slits_new.py +++ b/slic/devices/xoptics/slits_new.py @@ -1,6 +1,6 @@ from slic.devices.general.motor import Motor from ..general.adjustable import AdjustableVirtual -from slic.utils.eco_components.aliases import Alias, append_object_to_object +from slic.utils.deprecated.aliases import Alias, append_object_to_object from functools import partial diff --git a/slic/utils/eco_components/__init__.py b/slic/utils/deprecated/__init__.py similarity index 100% rename from slic/utils/eco_components/__init__.py rename to slic/utils/deprecated/__init__.py diff --git a/slic/utils/eco_components/aliases.py b/slic/utils/deprecated/aliases.py similarity index 100% rename from slic/utils/eco_components/aliases.py rename to slic/utils/deprecated/aliases.py