mirror of
https://github.com/bec-project/ophyd_devices.git
synced 2025-06-24 19:51:09 +02:00
fix(dxp): fix multiple signals marked as trigger_signals for dxp Falcon, but ophyd only supports 1 trigger signal
This commit is contained in:
@ -158,7 +158,7 @@ class EpicsDXPFalconMultiElementSystem(EpicsDXPBaseSystem):
|
|||||||
# Acquisition control
|
# Acquisition control
|
||||||
erase_all = Cpt(EpicsSignal, "EraseAll")
|
erase_all = Cpt(EpicsSignal, "EraseAll")
|
||||||
erase_start = Cpt(EpicsSignal, "EraseStart", put_complete=True, trigger_value=1)
|
erase_start = Cpt(EpicsSignal, "EraseStart", put_complete=True, trigger_value=1)
|
||||||
start_all = Cpt(EpicsSignal, "StartAll", put_complete=True, trigger_value=1)
|
start_all = Cpt(EpicsSignal, "StartAll", put_complete=True)
|
||||||
stop_all = Cpt(EpicsSignal, "StopAll")
|
stop_all = Cpt(EpicsSignal, "StopAll")
|
||||||
|
|
||||||
# Status
|
# Status
|
||||||
@ -231,7 +231,7 @@ class EpicsDXPMultiElementSystem(_EpicsDXPMultiElementSystem):
|
|||||||
# Override some action signals, so calling `set`` method
|
# Override some action signals, so calling `set`` method
|
||||||
# returns a waitable Status object. Otherwise the Status object is immediately done.
|
# returns a waitable Status object. Otherwise the Status object is immediately done.
|
||||||
erase_start = Cpt(EpicsSignal, "EraseStart", put_complete=True, trigger_value=1)
|
erase_start = Cpt(EpicsSignal, "EraseStart", put_complete=True, trigger_value=1)
|
||||||
start_all = Cpt(EpicsSignal, "StartAll", put_complete=True, trigger_value=1)
|
start_all = Cpt(EpicsSignal, "StartAll", put_complete=True)
|
||||||
|
|
||||||
# mca.EpicsDXPMultiElementSystem maps the EPICS records under wrong names, i.e.
|
# mca.EpicsDXPMultiElementSystem maps the EPICS records under wrong names, i.e.
|
||||||
# copy_adcp_ercent_rule, copy_roic_hannel and copy_roie_nergy
|
# copy_adcp_ercent_rule, copy_roic_hannel and copy_roie_nergy
|
||||||
|
@ -99,6 +99,18 @@ def test_falcon(mock_falcon):
|
|||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
def test_falcon_trigger(mock_falcon):
|
||||||
|
"""Test the Falcon device trigger method."""
|
||||||
|
mock_falcon: TestFalcon
|
||||||
|
mock_falcon.erase_start.put(0)
|
||||||
|
assert mock_falcon.erase_start.get() == 0
|
||||||
|
status = mock_falcon.trigger()
|
||||||
|
# Tagged trigger value, should be set to 1 when trigger is called
|
||||||
|
assert mock_falcon.erase_start.get() == 1
|
||||||
|
assert status.success is True
|
||||||
|
assert status.done is True
|
||||||
|
|
||||||
|
|
||||||
def test_xmap(mock_xmap):
|
def test_xmap(mock_xmap):
|
||||||
"""Test the xMAP device."""
|
"""Test the xMAP device."""
|
||||||
# Test the default values
|
# Test the default values
|
||||||
|
Reference in New Issue
Block a user