bec/ophyd_devices
1
0
Fork 0
Code Issues 9 Pull Requests 10 Actions Packages Projects Releases 126 Wiki Activity

feat: flomni stages

Browse Source
This commit is contained in:
wakonig_k 2023-12-12 09:13:58 +01:00 committed by wakonig_k
parent 1c95220234
commit 5e9d3aed17
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ophyd_devices/epics/devices/__init__.py
View File

@ -30,5 +30,3 @@ from .specMotors import (
) )
from .SpmBase import SpmBase from .SpmBase import SpmBase
from .XbpmBase import XbpmBase, XbpmCsaxsOp from .XbpmBase import XbpmBase, XbpmCsaxsOp
# from .psi_detector_base import PSIDetectorBase, CustomDetectorMixin

3
ophyd_devices/galil/fgalil_ophyd.py
View File

@ -8,6 +8,8 @@ from ophyd import Component as Cpt
from ophyd import Device, PositionerBase, Signal from ophyd import Device, PositionerBase, Signal
from ophyd.status import wait as status_wait from ophyd.status import wait as status_wait
from ophyd.utils import LimitError, ReadOnlyError from ophyd.utils import LimitError, ReadOnlyError
from prettytable import PrettyTable
from ophyd_devices.galil.galil_ophyd import ( from ophyd_devices.galil.galil_ophyd import (
BECConfigError, BECConfigError,
GalilAxesReferenced, GalilAxesReferenced,
@ -23,7 +25,6 @@ from ophyd_devices.galil.galil_ophyd import (
) )
from ophyd_devices.utils.controller import Controller, threadlocked from ophyd_devices.utils.controller import Controller, threadlocked
from ophyd_devices.utils.socket import SocketIO, SocketSignal, raise_if_disconnected from ophyd_devices.utils.socket import SocketIO, SocketSignal, raise_if_disconnected
from prettytable import PrettyTable
logger = bec_logger.logger logger = bec_logger.logger

9
ophyd_devices/rt_lamni/rt_flomni_ophyd.py
View File

@ -9,6 +9,8 @@ from ophyd import Component as Cpt
from ophyd import Device, PositionerBase, Signal from ophyd import Device, PositionerBase, Signal
from ophyd.status import wait as status_wait from ophyd.status import wait as status_wait
from ophyd.utils import LimitError, ReadOnlyError from ophyd.utils import LimitError, ReadOnlyError
from prettytable import PrettyTable
from ophyd_devices.rt_lamni.rt_ophyd import ( from ophyd_devices.rt_lamni.rt_ophyd import (
BECConfigError, BECConfigError,
RtCommunicationError, RtCommunicationError,
@ -21,7 +23,6 @@ from ophyd_devices.rt_lamni.rt_ophyd import (
) )
from ophyd_devices.utils.controller import Controller, threadlocked from ophyd_devices.utils.controller import Controller, threadlocked
from ophyd_devices.utils.socket import SocketIO, SocketSignal, raise_if_disconnected from ophyd_devices.utils.socket import SocketIO, SocketSignal, raise_if_disconnected
from prettytable import PrettyTable
logger = bec_logger.logger logger = bec_logger.logger
@ -122,8 +123,7 @@ class RtFlomniController(RtController):
fsamx_in = fsamx.user_parameter.get("in") fsamx_in = fsamx.user_parameter.get("in")
if not np.isclose(fsamx.obj.readback.get(), fsamx_in, atol=0.3): if not np.isclose(fsamx.obj.readback.get(), fsamx_in, atol=0.3):
raise RtError( raise RtError(
"Something is wrong. fsamx is very far from the samx_in position. Don't dare" "Something is wrong. fsamx is very far from the samx_in position. Don't dare correct automatically."
" correct automatically."
) )
if not np.isclose(fsamx.obj.readback.get(), fsamx_in, atol=0.01): if not np.isclose(fsamx.obj.readback.get(), fsamx_in, atol=0.01):
@ -156,8 +156,7 @@ class RtFlomniController(RtController):
self.rt_pid_voltage = rtx.user_parameter.get("rt_pid_voltage") self.rt_pid_voltage = rtx.user_parameter.get("rt_pid_voltage")
if self.rt_pid_voltage is None: if self.rt_pid_voltage is None:
raise RtError( raise RtError(
"rt_pid_voltage not set in rtx user parameters. Please run" "rt_pid_voltage not set in rtx user parameters. Please run feedback_enable_with_reset first."
" feedback_enable_with_reset first."
) )
logger.info(f"Using PID voltage from rtx user parameter: {self.rt_pid_voltage}") logger.info(f"Using PID voltage from rtx user parameter: {self.rt_pid_voltage}")
expected_voltage = self.rt_pid_voltage + fovx / 2 * 7 / 100 expected_voltage = self.rt_pid_voltage + fovx / 2 * 7 / 100