tligui_y/slic
0
0
Fork 0
forked from slic/slic
Code Pull Requests Actions Wiki Activity

switched from epics.PV to modified get_pv

Browse Source
This commit is contained in:
augustin_s
2021-10-12 00:52:09 +02:00
parent 707f7577af
commit c19ab5fbe4
25 changed files with 52 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
slic/core/acquisition/pvacquisition.py
+1 -1
View File
@@ -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
slic/core/adjustable/pvchangemon.py
+1 -1
View File
@@ -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
slic/core/condition/pvcondition.py
+1 -3
View File
@@ -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
slic/devices/endstations/alvra_flex.py
+1 -1
View File
@@ -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:
slic/devices/endstations/alvra_prime.py
+2 -2
View File
@@ -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:
slic/devices/endstations/bernina_cameras.py
+2 -6
View File
@@ -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)
slic/devices/endstations/bernina_diffractometers.py
-8
View File
@@ -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 ###
slic/devices/general/detectors.py
+11 -9
View File
@@ -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
slic/devices/general/detectors_new.py
+8 -11
View File
@@ -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:
slic/devices/loptics/bernina_experiment.py
-2
View File
@@ -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
slic/devices/timing/event_timing.py
+5 -3
View File
@@ -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 = {
slic/devices/timing/lasertiming.py
+1 -1
View File
@@ -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
slic/devices/xdiagnostics/intensity_monitors_new.py
+4 -5
View File
@@ -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:
slic/devices/xdiagnostics/profile_monitors.py
+2 -5
View File
@@ -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:
slic/devices/xdiagnostics/profile_monitors_new.py
+1 -5
View File
@@ -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)
slic/devices/xdiagnostics/timetools.py
+5 -10
View File
@@ -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:
slic/devices/xoptics/attenuator_aramis.py
+1 -1
View File
@@ -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):
slic/devices/xoptics/attenuator_aramis_new.py
+1 -1
View File
@@ -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:
slic/devices/xoptics/dcm.py
+1 -1
View File
@@ -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
slic/devices/xoptics/kbhor.py
+1 -1
View File
@@ -1,4 +1,4 @@
from epics import PV
#from slic.utils.hastyepics import get_pv as PV
from slic.devices.general.motor import Motor
slic/devices/xoptics/kbver.py
+1 -1
View File
@@ -1,4 +1,4 @@
from epics import PV
#from slic.utils.hastyepics import get_pv as PV
from slic.devices.general.motor import Motor
slic/devices/xoptics/offset_mirrors.py
-2
View File
@@ -1,5 +1,3 @@
from epics import PV
from slic.devices.general.motor import Motor
from slic.utils.eco_components.aliases import Alias
slic/devices/xoptics/pp.py
+1 -1
View File
@@ -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
slic/devices/xoptics/reflaser.py
-1
View File
@@ -1,4 +1,3 @@
from epics import PV
from slic.devices.general.motor import Motor
slic/utils/pyepics.py
+1 -1
View File
@@ -1,4 +1,4 @@
from epics import PV
from slic.utils.hastyepics import get_pv as PV
class EnumWrapper: