Skip to content

Commit b42c37b

Browse files
Disarm Jungfrau reverts pedestal mode (#1068)
* Jungfrau moves out of pedestal mode during disarm
1 parent 99f8190 commit b42c37b

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

src/ophyd_async/fastcs/jungfrau/_controller.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,3 +151,7 @@ async def wait_for_idle(self):
151151

152152
async def disarm(self):
153153
await self._driver.acquisition_stop.trigger()
154+
await asyncio.gather(
155+
self._driver.pedestal_mode_state.set(PedestalMode.OFF),
156+
self._driver.acquisition_type.set(AcquisitionType.STANDARD),
157+
)

tests/core/test_log.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import io
22
import logging
3-
import logging.handlers
43
from unittest.mock import MagicMock, patch
54

65
import pytest

tests/fastcs/jungfrau/test_controller.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,12 @@ async def test_wait_for_idle(mock_wait_for_value: AsyncMock, jungfrau: Jungfrau)
109109

110110
async def test_disarm(jungfrau: Jungfrau):
111111
jungfrau.drv.acquisition_stop.trigger = AsyncMock()
112+
jungfrau.drv.pedestal_mode_state.set = AsyncMock()
113+
jungfrau.drv.acquisition_type.set = AsyncMock()
112114
await jungfrau._controller.disarm()
113115
jungfrau.drv.acquisition_stop.trigger.assert_called_once()
116+
jungfrau.drv.pedestal_mode_state.set.assert_awaited_once_with(PedestalMode.OFF)
117+
jungfrau.drv.acquisition_type.set.assert_awaited_once_with(AcquisitionType.STANDARD)
114118

115119

116120
async def test_signals_set_in_pedestal_mode(jungfrau: Jungfrau):

0 commit comments

Comments
 (0)