Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions devices/master_clock.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,26 @@
from typing import List
from ophyd_async.core import StandardReadable
from ophyd_async.tango.core import tango_signal_rw, tango_signal_r


class MasterClock(StandardReadable):
"""
Tango-based master clock with setpoint/readback attributes.
"""
def __init__(self, device: str, *, name: str = "mc",
set_attr: str = "frequency_setpoint",
rdbk_attr: str = "frequency_readback"):

def __init__(
self,
device: str,
*,
name: str = "mc",
set_attr: str = "frequency_setpoint",
rdbk_attr: str = "frequency_readback",
):
with self.add_children_as_readables():
self.setpoint = tango_signal_rw(float, f"{device}/{set_attr}", name="ref_freq")
self.readback = tango_signal_r (float, f"{device}/{rdbk_attr}", name="rdbk")
self.setpoint = tango_signal_rw(
float, f"{device}/{set_attr}", name="ref_freq"
)
self.readback = tango_signal_r(float, f"{device}/{rdbk_attr}", name="rdbk")
super().__init__(name=name)
self.set_frequency_at_start = None

Expand Down
18 changes: 10 additions & 8 deletions devices/power_converter.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,18 @@
)
from ophyd_async.tango.core import TangoReadable, TangoPolling

from accml.core.utils.ophyd_async.multiplexer_for_settable_devices import _MultiplexerItemProxy
from accml.core.utils.ophyd_async.multiplexer_for_settable_devices import (
_MultiplexerItemProxy,
)


class MultiplexerItemProxy(_MultiplexerItemProxy):
"""
Todo:
need to provide difference current
"""
"""
Todo:
need to provide difference current
"""

pass
pass


class PowerConverterBase(TangoReadable, AsyncStageable):
Expand Down Expand Up @@ -107,6 +109,6 @@ class PowerConverter(PowerConverterBase):
"""

# fmt: off
current_setpoint: A[ SignalRW[float] , Format.HINTED_UNCACHED_SIGNAL, TangoPolling(1.0, 0.01, 1e-4) ]
current_readback: A[ SignalR[float] , Format.UNCACHED_SIGNAL, TangoPolling(1.0, 0.01, 1e-4) ]
current_setpoint: A[SignalRW[float], Format.HINTED_UNCACHED_SIGNAL, TangoPolling(1.0, 0.01, 1e-4)]
current_readback: A[SignalR[float], Format.UNCACHED_SIGNAL, TangoPolling(1.0, 0.01, 1e-4)]
# fmt: on
8 changes: 5 additions & 3 deletions devices/tunes.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@


class Tunes(TangoReadable):
x: A[ SignalRW[float] , Format.HINTED_UNCACHED_SIGNAL , TangoPolling(.5, 0.01, 1e-4) ]
y: A[ SignalRW[float] , Format.HINTED_UNCACHED_SIGNAL , TangoPolling(.5, 0.01, 1e-4) ]
count : A[ SignalRW[int] , Format.HINTED_UNCACHED_SIGNAL ]
# fmt:off
x: A[SignalRW[float], Format.HINTED_UNCACHED_SIGNAL, TangoPolling(.5, 0.01, 1e-4)]
y: A[SignalRW[float], Format.HINTED_UNCACHED_SIGNAL, TangoPolling(.5, 0.01, 1e-4)]
# fmt:on
count: A[SignalRW[int], Format.HINTED_UNCACHED_SIGNAL]