Skip to content

Commit

Permalink
Add soft metadata signal to TetrAMM & i22 instances
Browse files Browse the repository at this point in the history
  • Loading branch information
DiamondJoseph committed Jun 3, 2024
1 parent 1223427 commit 99e4cc2
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
2 changes: 2 additions & 0 deletions src/dodal/beamlines/i22.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ def i0(
"-EA-XBPM-02:",
wait_for_connection,
fake_with_ophyd_sim,
type="Cividec Diamond XBPM",
directory_provider=get_directory_provider(),
)

Expand All @@ -93,6 +94,7 @@ def it(
"-EA-TTRM-02:",
wait_for_connection,
fake_with_ophyd_sim,
type="PIN Diode",
directory_provider=get_directory_provider(),
)

Expand Down
16 changes: 11 additions & 5 deletions src/dodal/devices/tetramm.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
ShapeProvider,
StandardDetector,
set_and_wait_for_value,
soft_signal_r_and_setter,
)
from ophyd_async.epics.areadetector.utils import stop_busy_record
from ophyd_async.epics.areadetector.writers import HDFWriter, NDFileHDF
Expand Down Expand Up @@ -214,11 +215,20 @@ def __init__(
prefix: str,
directory_provider: DirectoryProvider,
name: str,
type: str | None = None,
**scalar_sigs: str,
) -> None:
self.drv = TetrammDriver(prefix + "DRV:")
self.hdf = NDFileHDF(prefix + "HDF5:")
controller = TetrammController(self.drv)
config_signals = [
self.drv.values_per_reading,
self.drv.averaging_time,
self.drv.sample_time,
]
if type:
type_signal, _ = soft_signal_r_and_setter(str, type)
config_signals.append(type_signal)
super().__init__(
controller,
HDFWriter(
Expand All @@ -228,11 +238,7 @@ def __init__(
TetrammShapeProvider(controller),
**scalar_sigs,
),
[
self.drv.values_per_reading,
self.drv.averaging_time,
self.drv.sample_time,
],
config_signals,
name,
)

Expand Down

0 comments on commit 99e4cc2

Please sign in to comment.