From db32219bd34a64052703408f335f1725aeab0868 Mon Sep 17 00:00:00 2001 From: Klaus Wakonig Date: Thu, 2 Mar 2023 18:25:27 +0100 Subject: [PATCH] refactor: fixed black formatting --- ophyd_devices/epics/devices/SpmBase.py | 1 + ophyd_devices/epics/devices/X07MADevices.py | 102 +++++++++++++------- ophyd_devices/epics/devices/XbpmBase.py | 1 + ophyd_devices/galil/galil_ophyd.py | 1 - ophyd_devices/npoint/npoint.py | 1 - ophyd_devices/npoint/npoint_ophyd.py | 1 - ophyd_devices/smaract/serializer.py | 1 - ophyd_devices/utils/controller.py | 1 - 8 files changed, 68 insertions(+), 41 deletions(-) diff --git a/ophyd_devices/epics/devices/SpmBase.py b/ophyd_devices/epics/devices/SpmBase.py index f996bd3..83e7b0c 100644 --- a/ophyd_devices/epics/devices/SpmBase.py +++ b/ophyd_devices/epics/devices/SpmBase.py @@ -54,6 +54,7 @@ class SpmSim(SpmBase): def _simFrame(self): """Generator to simulate a jumping gaussian""" + # Define normalized 2D gaussian def gaus2d(x=0, y=0, mx=0, my=0, sx=1, sy=1): return np.exp( diff --git a/ophyd_devices/epics/devices/X07MADevices.py b/ophyd_devices/epics/devices/X07MADevices.py index ae1c804..f1d4ca3 100644 --- a/ophyd_devices/epics/devices/X07MADevices.py +++ b/ophyd_devices/epics/devices/X07MADevices.py @@ -6,56 +6,65 @@ from typing import Any from ophyd import Component as Cpt from ophyd import FormattedComponent as FCpt -from ophyd import ( - Device, - EpicsSignal, - EpicsSignalRO, - Kind, - PVPositioner, - EpicsMotor -) +from ophyd import Device, EpicsSignal, EpicsSignalRO, Kind, PVPositioner, EpicsMotor from ophyd.pv_positioner import PVPositionerComparator -__all__ = ["X07MAUndulator", "PGMMonochromator", "PGMOtFScan", "VacuumValve", "X07MAExitSlit", - "X07MAMagnet", "X07MAAnalogSignals", "X07MASampleManipulator", - "X07MATemperatureController", "X07MAAutoTemperatureControl"] +__all__ = [ + "X07MAUndulator", + "PGMMonochromator", + "PGMOtFScan", + "VacuumValve", + "X07MAExitSlit", + "X07MAMagnet", + "X07MAAnalogSignals", + "X07MASampleManipulator", + "X07MATemperatureController", + "X07MAAutoTemperatureControl", +] + class X07MAUndulator(PVPositioner): """ X07MA undulator """ + setpoint = Cpt(EpicsSignal, "ENERGY", auto_monitor=True) - readback = Cpt(EpicsSignalRO, "ENERGY-READ", kind=Kind.hinted, auto_monitor=True) + readback = Cpt(EpicsSignalRO, "ENERGY-READ", kind=Kind.hinted, auto_monitor=True) done = Cpt(EpicsSignalRO, "DONE", kind=Kind.omitted, auto_monitor=True) stop_signal = Cpt(EpicsSignal, "STOP", kind=Kind.omitted) - + energy_offset = Cpt(EpicsSignal, "ENERGY-OFFS", kind=Kind.config) pol_mode = Cpt(EpicsSignal, "MODE") pol_angle = Cpt(EpicsSignal, "ALPHA") harmonic = Cpt(EpicsSignal, "HARMONIC") + class PGMMonochromator(PVPositioner): """ PGM monochromator """ + setpoint = Cpt(EpicsSignal, "PHS-E:GO.A", auto_monitor=True) - readback = Cpt(EpicsSignalRO, "PGM:CERBK", kind=Kind.hinted, auto_monitor=True) + readback = Cpt(EpicsSignalRO, "PGM:CERBK", kind=Kind.hinted, auto_monitor=True) done = Cpt(EpicsSignalRO, "PHS:alldone", kind=Kind.omitted, auto_monitor=True) stop_signal = Cpt(EpicsSignal, "PGM:stop", kind=Kind.omitted) cff = Cpt(EpicsSignal, "PGM:rbkcff", write_pv="PGM:cff.A", kind=Kind.config) with_undulator = Cpt(EpicsSignal, "PHS-E:OPT", kind=Kind.config) + class PGMOtFScan(Device): """ PGM on-the-fly scan """ + e1 = Cpt(EpicsSignal, "E1") e2 = Cpt(EpicsSignal, "E2") - time = Cpt(EpicsSignal, 'TIME') - folder = Cpt(EpicsSignal, 'FOLDER') - file = Cpt(EpicsSignal, 'FILE') - start = Cpt(EpicsSignal, 'START') + time = Cpt(EpicsSignal, "TIME") + folder = Cpt(EpicsSignal, "FOLDER") + file = Cpt(EpicsSignal, "FILE") + start = Cpt(EpicsSignal, "START") + class VacuumValve(PVPositionerComparator): """ @@ -67,14 +76,15 @@ class VacuumValve(PVPositionerComparator): The readback is of 8 choices 0 - TO CONNECT - 1 - MAN OPEN - 2 - CLOSED - 3 - ERROR - 4 - MOVING - 5 - OPEN - 6 - ERROR - 7 - ERROR + 1 - MAN OPEN + 2 - CLOSED + 3 - ERROR + 4 - MOVING + 5 - OPEN + 6 - ERROR + 7 - ERROR """ + setpoint = Cpt(EpicsSignal, "WT_SET") readback = Cpt(EpicsSignalRO, "POSITION") @@ -82,44 +92,58 @@ class VacuumValve(PVPositionerComparator): kwargs.update({"limits": (0, 1)}) super().__init__(prefix, name=name, **kwargs) - def done_comparator(self, readback:Any, setpoint:Any) -> bool: + def done_comparator(self, readback: Any, setpoint: Any) -> bool: return readback != 4 + class X07MAExitSlit(PVPositioner): """ Exit slit """ + setpoint = Cpt(EpicsSignal, "TR_AP") readback = Cpt(EpicsSignalRO, "TR_ISAP", kind=Kind.hinted, auto_monitor=True) done = Cpt(EpicsSignalRO, "TR.DMOV", kind=Kind.omitted, auto_monitor=True) + class X07MAMagnet(Device): """ Magnet fields. """ + class MagnetAxis(PVPositioner): """ A single magnet field axis. """ + done_value = 2 actuate_value = 1 setpoint = FCpt(EpicsSignal, "{prefix}{_axis_id}:DMD") - readback = FCpt(EpicsSignalRO, "{prefix}{_axis_id}:RBV", kind=Kind.hinted, auto_monitor=True) + readback = FCpt( + EpicsSignalRO, "{prefix}{_axis_id}:RBV", kind=Kind.hinted, auto_monitor=True + ) actuate = Cpt(EpicsSignal, "STARTRAMP.PROC", kind=Kind.omitted) - done = FCpt(EpicsSignalRO, '{_ps_prefix}STS:RAMP:MADE', kind=Kind.omitted, auto_monitor=True) - ramprate = FCpt(EpicsSignal, "{_ps_prefix}STS:RAMPRATE:TPM", write_pv="{_ps_prefix}SET:DMD:RAMPRATE:TPM") + done = FCpt( + EpicsSignalRO, "{_ps_prefix}STS:RAMP:MADE", kind=Kind.omitted, auto_monitor=True + ) + ramprate = FCpt( + EpicsSignal, "{_ps_prefix}STS:RAMPRATE:TPM", write_pv="{_ps_prefix}SET:DMD:RAMPRATE:TPM" + ) + def __init__(self, prefix="", axis_id="", ps_prefix="", *, name=None, **kwargs): self._axis_id = axis_id self._ps_prefix = ps_prefix super().__init__(prefix, name=name, **kwargs) - x = Cpt(MagnetAxis, '', axis_id='X', ps_prefix='X07MA-PC-PS2:', name='x') - z = Cpt(MagnetAxis, '', axis_id='Z', ps_prefix='X07MA-PC-PS1:', name='z') + x = Cpt(MagnetAxis, "", axis_id="X", ps_prefix="X07MA-PC-PS2:", name="x") + z = Cpt(MagnetAxis, "", axis_id="Z", ps_prefix="X07MA-PC-PS1:", name="z") + class X07MAAnalogSignals(Device): """ ADC inputs """ + s1 = Cpt(EpicsSignalRO, "SIGNAL0") s2 = Cpt(EpicsSignalRO, "SIGNAL1") s3 = Cpt(EpicsSignalRO, "SIGNAL2") @@ -135,25 +159,31 @@ class X07MAAnalogSignals(Device): field_z = s4 field_x = s5 + class X07MASampleManipulator(Device): """ Sample manipulator """ + hor = Cpt(EpicsMotor, "TRZS") vert = Cpt(EpicsMotor, "TRY1") rot = Cpt(EpicsMotor, "ROY1") + class X07MATemperatureController(Device): """ Temperature controller """ - needle_valve = Cpt(EpicsSignal, 'STS:LOOP2:MANUAL', write_pv='DMD:LOOP2:MANUAL') - setpoint = Cpt(EpicsSignal, 'STS:LOOP1:SETPOINT', write_pv='DMD:LOOP1:SETPOINT') - readback = Cpt(EpicsSignalRO, 'STS:T1', kind=Kind.hinted, auto_monitor=True) + + needle_valve = Cpt(EpicsSignal, "STS:LOOP2:MANUAL", write_pv="DMD:LOOP2:MANUAL") + setpoint = Cpt(EpicsSignal, "STS:LOOP1:SETPOINT", write_pv="DMD:LOOP1:SETPOINT") + readback = Cpt(EpicsSignalRO, "STS:T1", kind=Kind.hinted, auto_monitor=True) + class X07MAAutoTemperatureControl(Device): """ Automatic temperature control. """ - control = Cpt(EpicsSignal, 'CONTROL') - status = Cpt(EpicsSignalRO, 'STATUS', kind=Kind.hinted, string=True, auto_monitor=True) + + control = Cpt(EpicsSignal, "CONTROL") + status = Cpt(EpicsSignalRO, "STATUS", kind=Kind.hinted, string=True, auto_monitor=True) diff --git a/ophyd_devices/epics/devices/XbpmBase.py b/ophyd_devices/epics/devices/XbpmBase.py index 9035412..92d9e17 100644 --- a/ophyd_devices/epics/devices/XbpmBase.py +++ b/ophyd_devices/epics/devices/XbpmBase.py @@ -84,6 +84,7 @@ class XbpmSim(XbpmBase): def _simFrame(self): """Generator to simulate a jumping gaussian""" + # define normalized 2D gaussian def gaus2d(x=0, y=0, mx=0, my=0, sx=1, sy=1): return np.exp( diff --git a/ophyd_devices/galil/galil_ophyd.py b/ophyd_devices/galil/galil_ophyd.py index 261e330..7c89d15 100644 --- a/ophyd_devices/galil/galil_ophyd.py +++ b/ophyd_devices/galil/galil_ophyd.py @@ -559,7 +559,6 @@ class GalilMotor(Device, PositionerBase): if __name__ == "__main__": - mock = False if not mock: leyey = GalilMotor("H", name="leyey", host="mpc2680.psi.ch", port=8081, sign=-1) diff --git a/ophyd_devices/npoint/npoint.py b/ophyd_devices/npoint/npoint.py index 64a1e6d..5121b92 100644 --- a/ophyd_devices/npoint/npoint.py +++ b/ophyd_devices/npoint/npoint.py @@ -174,7 +174,6 @@ class NPointController(SingletonController): @channel_checked def _get_current_pos(self, channel: int) -> float: - # for first channel: 0x11 83 13 34 addr = self._channel_base.copy() addr.extend([f"{19 + 16 * channel:x}", "34"]) diff --git a/ophyd_devices/npoint/npoint_ophyd.py b/ophyd_devices/npoint/npoint_ophyd.py index c6eb6b5..8bd8353 100644 --- a/ophyd_devices/npoint/npoint_ophyd.py +++ b/ophyd_devices/npoint/npoint_ophyd.py @@ -137,7 +137,6 @@ class NPointController(SingletonController): @channel_checked def _get_current_pos(self, channel: int) -> float: - # for first channel: 0x11 83 13 34 addr = self._channel_base.copy() addr.extend([f"{19 + 16 * channel:x}", "34"]) diff --git a/ophyd_devices/smaract/serializer.py b/ophyd_devices/smaract/serializer.py index 60cf9cf..a22cb81 100644 --- a/ophyd_devices/smaract/serializer.py +++ b/ophyd_devices/smaract/serializer.py @@ -27,7 +27,6 @@ def is_serializable(f) -> bool: def get_user_interface(obj, obj_interface): - # user_funcs = get_user_functions(obj) for f in [f for f in dir(obj) if f in obj.USER_ACCESS]: if f == "controller" or f == "on": diff --git a/ophyd_devices/utils/controller.py b/ophyd_devices/utils/controller.py index da5ecfb..6c0785b 100644 --- a/ophyd_devices/utils/controller.py +++ b/ophyd_devices/utils/controller.py @@ -51,7 +51,6 @@ class Controller(OphydObject): labels=None, kind=None, ): - if not hasattr(self, "_initialized"): super().__init__( name=name, attr_name=attr_name, parent=parent, labels=labels, kind=kind