From c19ab5fbe41e57a64ec0603ce9e415fbebf41558 Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Tue, 12 Oct 2021 00:52:09 +0200 Subject: [PATCH] switched from epics.PV to modified get_pv --- slic/core/acquisition/pvacquisition.py | 2 +- slic/core/adjustable/pvchangemon.py | 2 +- slic/core/condition/pvcondition.py | 4 +--- slic/devices/endstations/alvra_flex.py | 2 +- slic/devices/endstations/alvra_prime.py | 4 ++-- slic/devices/endstations/bernina_cameras.py | 8 ++------ .../endstations/bernina_diffractometers.py | 8 -------- slic/devices/general/detectors.py | 20 ++++++++++--------- slic/devices/general/detectors_new.py | 19 ++++++++---------- slic/devices/loptics/bernina_experiment.py | 2 -- slic/devices/timing/event_timing.py | 8 +++++--- slic/devices/timing/lasertiming.py | 2 +- .../xdiagnostics/intensity_monitors_new.py | 9 ++++----- slic/devices/xdiagnostics/profile_monitors.py | 7 ++----- .../xdiagnostics/profile_monitors_new.py | 6 +----- slic/devices/xdiagnostics/timetools.py | 15 +++++--------- slic/devices/xoptics/attenuator_aramis.py | 2 +- slic/devices/xoptics/attenuator_aramis_new.py | 2 +- slic/devices/xoptics/dcm.py | 2 +- slic/devices/xoptics/kbhor.py | 2 +- slic/devices/xoptics/kbver.py | 2 +- slic/devices/xoptics/offset_mirrors.py | 2 -- slic/devices/xoptics/pp.py | 2 +- slic/devices/xoptics/reflaser.py | 1 - slic/utils/pyepics.py | 2 +- 25 files changed, 52 insertions(+), 83 deletions(-) diff --git a/slic/core/acquisition/pvacquisition.py b/slic/core/acquisition/pvacquisition.py index 5a3a66504..65b2436f0 100644 --- a/slic/core/acquisition/pvacquisition.py +++ b/slic/core/acquisition/pvacquisition.py @@ -1,9 +1,9 @@ from time import sleep import numpy as np -from epics import PV import h5py from slic.utils import get_dtype, get_shape +from slic.utils.hastyepics import get_pv as PV from .acquisition import Acquisition diff --git a/slic/core/adjustable/pvchangemon.py b/slic/core/adjustable/pvchangemon.py index c8a148429..b6eb19b75 100644 --- a/slic/core/adjustable/pvchangemon.py +++ b/slic/core/adjustable/pvchangemon.py @@ -1,7 +1,7 @@ from time import sleep -from epics import PV from slic.utils import typename +from slic.utils.hastyepics import get_pv as PV from .adjustable import AdjustableError diff --git a/slic/core/condition/pvcondition.py b/slic/core/condition/pvcondition.py index 0e8d263cf..69b3e3b0b 100644 --- a/slic/core/condition/pvcondition.py +++ b/slic/core/condition/pvcondition.py @@ -1,7 +1,5 @@ -from epics import PV - from slic.utils import typename - +from slic.utils.hastyepics import get_pv as PV from .condition import Condition diff --git a/slic/devices/endstations/alvra_flex.py b/slic/devices/endstations/alvra_flex.py index 5d94cf84e..f82d0ab02 100755 --- a/slic/devices/endstations/alvra_flex.py +++ b/slic/devices/endstations/alvra_flex.py @@ -1,5 +1,5 @@ from slic.devices.general.motor import Motor -from epics import PV +from slic.utils.hastyepics import get_pv as PV class table: diff --git a/slic/devices/endstations/alvra_prime.py b/slic/devices/endstations/alvra_prime.py index 275e67a7c..5ac75c670 100644 --- a/slic/devices/endstations/alvra_prime.py +++ b/slic/devices/endstations/alvra_prime.py @@ -1,6 +1,6 @@ -from epics import PV from slic.devices.general.motor import Motor -from ..general.smaract import SmarActAxis +from slic.devices.general.smaract import SmarActAxis +from slic.utils.hastyepics import get_pv as PV class Huber: diff --git a/slic/devices/endstations/bernina_cameras.py b/slic/devices/endstations/bernina_cameras.py index ad9ea7889..766273434 100755 --- a/slic/devices/endstations/bernina_cameras.py +++ b/slic/devices/endstations/bernina_cameras.py @@ -1,12 +1,8 @@ -from slic.devices.general.motor import Motor -from ..general.detectors import CameraCA, CameraBS 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 ..devices_general.epics_wrappers import EnumSelector -from epics import PV -from slic.utils.pyepics import EnumWrapper - def addMotorToSelf(self, ID=None, name=None): self.__dict__[name] = Motor(ID, name=name) diff --git a/slic/devices/endstations/bernina_diffractometers.py b/slic/devices/endstations/bernina_diffractometers.py index ada35f35d..809ef9d4d 100644 --- a/slic/devices/endstations/bernina_diffractometers.py +++ b/slic/devices/endstations/bernina_diffractometers.py @@ -1,7 +1,5 @@ from slic.devices.general.motor import Motor from slic.core.adjustable import PVAdjustable - -from epics import PV from slic.utils.eco_components.aliases import Alias, append_object_to_object @@ -44,12 +42,6 @@ class GPS: append_object_to_object(self, PVAdjustable, "SARES20-HEX_PI:SET-POSI-U", pvname_readback="SARES20-HEX_PI:POSI-U", name="uhex") append_object_to_object(self, PVAdjustable, "SARES20-HEX_PI:SET-POSI-V", pvname_readback="SARES20-HEX_PI:POSI-V", name="vhex") append_object_to_object(self, PVAdjustable, "SARES20-HEX_PI:SET-POSI-W", pvname_readback="SARES20-HEX_PI:POSI-W", name="whex") - #self.hex_x = PV("SARES20-HEX_PI:POSI-X") - #self.hex_y = PV("SARES20-HEX_PI:POSI-Y") - #self.hex_z = PV("SARES20-HEX_PI:POSI-Z") - #self.hex_u = PV("SARES20-HEX_PI:POSI-U") - #self.hex_v = PV("SARES20-HEX_PI:POSI-V") - #self.hex_w = PV("SARES20-HEX_PI:POSI-W") if "hlxz" in self.configuration: ### motors heavy load goniometer ### diff --git a/slic/devices/general/detectors.py b/slic/devices/general/detectors.py index c04225b64..956f4d8b6 100755 --- a/slic/devices/general/detectors.py +++ b/slic/devices/general/detectors.py @@ -1,17 +1,19 @@ -import numpy as np -from epics import caget -from epics import PV -from slic.utils.pyepics import EnumWrapper +from datetime import datetime +from time import sleep +import subprocess +from epics import caget +import h5py +import numpy as np + +from bsread import source, SUB from cam_server_client import PipelineClient from cam_server_client.utils import get_host_port_from_stream_address -from bsread import source, SUB -import subprocess -import h5py -from time import sleep -from datetime import datetime from slic.core.task import Task +from slic.utils.pyepics import EnumWrapper +from slic.utils.hastyepics import get_pv as PV + try: import sys, os diff --git a/slic/devices/general/detectors_new.py b/slic/devices/general/detectors_new.py index 052155ef2..597fd65b6 100755 --- a/slic/devices/general/detectors_new.py +++ b/slic/devices/general/detectors_new.py @@ -1,18 +1,15 @@ -import numpy as np -from epics import caget -from epics import PV -from slic.utils.pyepics import EnumWrapper - -# from cam_server_client import PipelineClient -# from cam_server_client.utils import get_host_port_from_stream_address -# from bsread import source, SUB -import subprocess -import h5py -from time import sleep, time from datetime import datetime +from time import sleep, time +import subprocess + +from epics import caget +import h5py +import numpy as np from slic.core.task import Task from slic.utils.eco_components.aliases import Alias +from slic.utils.hastyepics import get_pv as PV +from slic.utils.pyepics import EnumWrapper class PvDataStream: diff --git a/slic/devices/loptics/bernina_experiment.py b/slic/devices/loptics/bernina_experiment.py index 95b0de57d..9f335646d 100755 --- a/slic/devices/loptics/bernina_experiment.py +++ b/slic/devices/loptics/bernina_experiment.py @@ -1,5 +1,3 @@ -from epics import PV - from slic.utils.eco_components.aliases import Alias from slic.devices.general.motor import Motor from ..general.smaract import SmarActAxis diff --git a/slic/devices/timing/event_timing.py b/slic/devices/timing/event_timing.py index 2f615bd24..c38e5d7c6 100644 --- a/slic/devices/timing/event_timing.py +++ b/slic/devices/timing/event_timing.py @@ -1,7 +1,9 @@ -from epics import PV -from slic.core.adjustable import PVEnumAdjustable -from cta_lib import CtaLib from numbers import Number +from cta_lib import CtaLib + +from slic.core.adjustable import PVEnumAdjustable +from slic.utils.hastyepics import get_pv as PV + # EVR output mapping evr_mapping = { diff --git a/slic/devices/timing/lasertiming.py b/slic/devices/timing/lasertiming.py index 2fdaa37be..b3506b5b8 100644 --- a/slic/devices/timing/lasertiming.py +++ b/slic/devices/timing/lasertiming.py @@ -3,11 +3,11 @@ from time import sleep, asctime from types import SimpleNamespace from abc import ABC, abstractmethod import numpy as np -from epics import PV from slic.core.adjustable import Adjustable from slic.devices.general.motor import check_pos_type from slic.utils import typename +from slic.utils.hastyepics import get_pv as PV OSCILLATOR_PERIOD = 1 / 71.368704e6 diff --git a/slic/devices/xdiagnostics/intensity_monitors_new.py b/slic/devices/xdiagnostics/intensity_monitors_new.py index 9b83a7534..ebd496b24 100755 --- a/slic/devices/xdiagnostics/intensity_monitors_new.py +++ b/slic/devices/xdiagnostics/intensity_monitors_new.py @@ -1,11 +1,10 @@ import numpy as np -from epics import PV - -from slic.devices.general.motor import Motor -from slic.utils.pyepics import EnumWrapper -from ..general.detectors_new import FeDigitizer, PvDataStream 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.pyepics import EnumWrapper +from slic.utils.hastyepics import get_pv as PV class GasDetector: diff --git a/slic/devices/xdiagnostics/profile_monitors.py b/slic/devices/xdiagnostics/profile_monitors.py index a8154c37c..4b560d7a4 100755 --- a/slic/devices/xdiagnostics/profile_monitors.py +++ b/slic/devices/xdiagnostics/profile_monitors.py @@ -1,10 +1,7 @@ -from epics import PV - from slic.devices.general.motor import Motor -from ..general.detectors import CameraCA, CameraBS - -#from ..general.epics_wrappers import EnumSelector +from slic.devices.general.detectors import CameraCA, CameraBS from slic.utils.pyepics import EnumWrapper +from slic.utils.hastyepics import get_pv as PV class Pprm: diff --git a/slic/devices/xdiagnostics/profile_monitors_new.py b/slic/devices/xdiagnostics/profile_monitors_new.py index ce167293d..9b4411090 100755 --- a/slic/devices/xdiagnostics/profile_monitors_new.py +++ b/slic/devices/xdiagnostics/profile_monitors_new.py @@ -1,12 +1,8 @@ from slic.devices.general.motor import Motor -from ..general.detectors import CameraCA, CameraBS +from slic.devices.general.detectors import CameraCA, CameraBS from slic.utils.eco_components.aliases import Alias, append_object_to_object from slic.core.adjustable import PVEnumAdjustable -# from ..devices_general.epics_wrappers import EnumSelector -from epics import PV -from slic.utils.pyepics import EnumWrapper - def addMotorToSelf(self, ID=None, name=None): self.__dict__[name] = Motor(ID, name=name) diff --git a/slic/devices/xdiagnostics/timetools.py b/slic/devices/xdiagnostics/timetools.py index 74ef65b43..c4c34e0b0 100644 --- a/slic/devices/xdiagnostics/timetools.py +++ b/slic/devices/xdiagnostics/timetools.py @@ -1,14 +1,9 @@ -from slic.devices.general.motor import Motor - -#from ..devices_general.smaract import SmarActAxis -#from epics import PV -from ..general.delay_stage import DelayStage - -#from ..devices_general.adjustable import -from slic.utils.eco_components.aliases import Alias, append_object_to_object -from psen_processing import PsenProcessingClient -from ..loptics.bernina_experiment import DelayTime from cam_server_client import PipelineClient +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 class SpectralEncoder: diff --git a/slic/devices/xoptics/attenuator_aramis.py b/slic/devices/xoptics/attenuator_aramis.py index 5f20f2616..9674451f0 100755 --- a/slic/devices/xoptics/attenuator_aramis.py +++ b/slic/devices/xoptics/attenuator_aramis.py @@ -1,5 +1,5 @@ -from epics import PV from slic.core.adjustable import Adjustable +from slic.utils.hastyepics import get_pv as PV class AttenuatorAramis(Adjustable): diff --git a/slic/devices/xoptics/attenuator_aramis_new.py b/slic/devices/xoptics/attenuator_aramis_new.py index 6470a9fae..9f9644f7d 100755 --- a/slic/devices/xoptics/attenuator_aramis_new.py +++ b/slic/devices/xoptics/attenuator_aramis_new.py @@ -1,8 +1,8 @@ -from epics import PV 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.hastyepics import get_pv as PV class AttenuatorAramis: diff --git a/slic/devices/xoptics/dcm.py b/slic/devices/xoptics/dcm.py index cf553cce2..6e37002d2 100755 --- a/slic/devices/xoptics/dcm.py +++ b/slic/devices/xoptics/dcm.py @@ -1,9 +1,9 @@ from types import SimpleNamespace from time import sleep import numpy as np -from epics import PV from slic.core.adjustable import Adjustable, PVAdjustable, PVEnumAdjustable +from slic.utils.hastyepics import get_pv as PV from slic.devices.general.motor import Motor from ..device import Device diff --git a/slic/devices/xoptics/kbhor.py b/slic/devices/xoptics/kbhor.py index fdf6c1b20..7029fac10 100755 --- a/slic/devices/xoptics/kbhor.py +++ b/slic/devices/xoptics/kbhor.py @@ -1,4 +1,4 @@ -from epics import PV +#from slic.utils.hastyepics import get_pv as PV from slic.devices.general.motor import Motor diff --git a/slic/devices/xoptics/kbver.py b/slic/devices/xoptics/kbver.py index 01ceb78ca..9a41aeef7 100755 --- a/slic/devices/xoptics/kbver.py +++ b/slic/devices/xoptics/kbver.py @@ -1,4 +1,4 @@ -from epics import PV +#from slic.utils.hastyepics import get_pv as PV from slic.devices.general.motor import Motor diff --git a/slic/devices/xoptics/offset_mirrors.py b/slic/devices/xoptics/offset_mirrors.py index ed4706472..39f0a6529 100755 --- a/slic/devices/xoptics/offset_mirrors.py +++ b/slic/devices/xoptics/offset_mirrors.py @@ -1,5 +1,3 @@ -from epics import PV - from slic.devices.general.motor import Motor from slic.utils.eco_components.aliases import Alias diff --git a/slic/devices/xoptics/pp.py b/slic/devices/xoptics/pp.py index aa3521107..c8dbc6c58 100755 --- a/slic/devices/xoptics/pp.py +++ b/slic/devices/xoptics/pp.py @@ -1,8 +1,8 @@ -from epics import PV from time import sleep import numpy as np from slic.devices.general.motor import Motor +from slic.utils.hastyepics import get_pv as PV from slic.utils.eco_components.aliases import Alias diff --git a/slic/devices/xoptics/reflaser.py b/slic/devices/xoptics/reflaser.py index 8402f58f2..364227314 100755 --- a/slic/devices/xoptics/reflaser.py +++ b/slic/devices/xoptics/reflaser.py @@ -1,4 +1,3 @@ -from epics import PV from slic.devices.general.motor import Motor diff --git a/slic/utils/pyepics.py b/slic/utils/pyepics.py index a36de822c..ca3bd7cb4 100644 --- a/slic/utils/pyepics.py +++ b/slic/utils/pyepics.py @@ -1,4 +1,4 @@ -from epics import PV +from slic.utils.hastyepics import get_pv as PV class EnumWrapper: