-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into 76_make_stage_synchronous_if_arming_not_star…
…ted_rebased
- Loading branch information
Showing
12 changed files
with
353 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,117 @@ | ||
from typing import Optional | ||
|
||
from ophyd import Component, Device, EpicsSignal, EpicsSignalRO | ||
from ophyd.status import Status, SubscriptionStatus | ||
|
||
from dodal.devices.detector import DetectorParams | ||
from dodal.devices.status import await_value | ||
from dodal.log import LOGGER | ||
|
||
|
||
class AtteunatorFilter(Device): | ||
actual_filter_state: EpicsSignalRO = Component(EpicsSignalRO, ":INLIM") | ||
|
||
|
||
class Attenuator(Device): | ||
# Sets transmission - range 0-1 | ||
def set(self, transmission) -> SubscriptionStatus: | ||
"""Get desired states and calculated states, return a status which is complete once they are equal""" | ||
|
||
LOGGER.info("Using current energy") | ||
self.use_current_energy.set(1).wait() | ||
LOGGER.info(f"Setting desired transmission to {transmission}") | ||
self.desired_transmission.set(transmission).wait() | ||
LOGGER.info("Sending change filter command") | ||
self.change.set(1).wait() | ||
|
||
status = Status(done=True, success=True) | ||
actual_states = self.get_actual_filter_state_list() | ||
calculated_states = self.get_calculated_filter_state_list() | ||
for i in range(16): | ||
status &= await_value( | ||
actual_states[i], calculated_states[i].get(), timeout=10 | ||
) | ||
return status | ||
|
||
calulated_filter_state_1: EpicsSignalRO = Component(EpicsSignalRO, "DEC_TO_BIN.B0") | ||
calulated_filter_state_2: EpicsSignalRO = Component(EpicsSignalRO, "DEC_TO_BIN.B1") | ||
calulated_filter_state_3: EpicsSignalRO = Component(EpicsSignalRO, "DEC_TO_BIN.B2") | ||
calulated_filter_state_4: EpicsSignalRO = Component(EpicsSignalRO, "DEC_TO_BIN.B3") | ||
calulated_filter_state_5: EpicsSignalRO = Component(EpicsSignalRO, "DEC_TO_BIN.B4") | ||
calulated_filter_state_6: EpicsSignalRO = Component(EpicsSignalRO, "DEC_TO_BIN.B5") | ||
calulated_filter_state_7: EpicsSignalRO = Component(EpicsSignalRO, "DEC_TO_BIN.B6") | ||
calulated_filter_state_8: EpicsSignalRO = Component(EpicsSignalRO, "DEC_TO_BIN.B7") | ||
calulated_filter_state_9: EpicsSignalRO = Component(EpicsSignalRO, "DEC_TO_BIN.B8") | ||
calulated_filter_state_10: EpicsSignalRO = Component(EpicsSignalRO, "DEC_TO_BIN.B9") | ||
calulated_filter_state_11: EpicsSignalRO = Component(EpicsSignalRO, "DEC_TO_BIN.BA") | ||
calulated_filter_state_12: EpicsSignalRO = Component(EpicsSignalRO, "DEC_TO_BIN.BB") | ||
calulated_filter_state_13: EpicsSignalRO = Component(EpicsSignalRO, "DEC_TO_BIN.BC") | ||
calulated_filter_state_14: EpicsSignalRO = Component(EpicsSignalRO, "DEC_TO_BIN.BD") | ||
calulated_filter_state_15: EpicsSignalRO = Component(EpicsSignalRO, "DEC_TO_BIN.BE") | ||
calulated_filter_state_16: EpicsSignalRO = Component(EpicsSignalRO, "DEC_TO_BIN.BF") | ||
|
||
filter_1: AtteunatorFilter = Component(AtteunatorFilter, "FILTER1") | ||
filter_2: AtteunatorFilter = Component(AtteunatorFilter, "FILTER2") | ||
filter_3: AtteunatorFilter = Component(AtteunatorFilter, "FILTER3") | ||
filter_4: AtteunatorFilter = Component(AtteunatorFilter, "FILTER4") | ||
filter_5: AtteunatorFilter = Component(AtteunatorFilter, "FILTER5") | ||
filter_6: AtteunatorFilter = Component(AtteunatorFilter, "FILTER6") | ||
filter_7: AtteunatorFilter = Component(AtteunatorFilter, "FILTER7") | ||
filter_8: AtteunatorFilter = Component(AtteunatorFilter, "FILTER8") | ||
filter_9: AtteunatorFilter = Component(AtteunatorFilter, "FILTER9") | ||
filter_10: AtteunatorFilter = Component(AtteunatorFilter, "FILTER10") | ||
filter_11: AtteunatorFilter = Component(AtteunatorFilter, "FILTER11") | ||
filter_12: AtteunatorFilter = Component(AtteunatorFilter, "FILTER12") | ||
filter_13: AtteunatorFilter = Component(AtteunatorFilter, "FILTER13") | ||
filter_14: AtteunatorFilter = Component(AtteunatorFilter, "FILTER14") | ||
filter_15: AtteunatorFilter = Component(AtteunatorFilter, "FILTER15") | ||
filter_16: AtteunatorFilter = Component(AtteunatorFilter, "FILTER16") | ||
|
||
desired_transmission: EpicsSignal = Component(EpicsSignal, "T2A:SETVAL1") | ||
use_current_energy: EpicsSignal = Component( | ||
EpicsSignal, "E2WL:USECURRENTENERY.PROC" | ||
) | ||
change: EpicsSignal = Component(EpicsSignal, "FANOUT") | ||
actual_transmission: EpicsSignal = Component(EpicsSignal, "MATCH") | ||
|
||
detector_params: Optional[DetectorParams] = None | ||
|
||
def get_calculated_filter_state_list(self) -> list[EpicsSignal]: | ||
return [ | ||
self.calulated_filter_state_1, | ||
self.calulated_filter_state_2, | ||
self.calulated_filter_state_3, | ||
self.calulated_filter_state_4, | ||
self.calulated_filter_state_5, | ||
self.calulated_filter_state_6, | ||
self.calulated_filter_state_7, | ||
self.calulated_filter_state_8, | ||
self.calulated_filter_state_9, | ||
self.calulated_filter_state_10, | ||
self.calulated_filter_state_11, | ||
self.calulated_filter_state_12, | ||
self.calulated_filter_state_13, | ||
self.calulated_filter_state_14, | ||
self.calulated_filter_state_15, | ||
self.calulated_filter_state_16, | ||
] | ||
|
||
def get_actual_filter_state_list(self) -> list[EpicsSignal]: | ||
return [ | ||
self.filter_1.actual_filter_state, | ||
self.filter_2.actual_filter_state, | ||
self.filter_3.actual_filter_state, | ||
self.filter_4.actual_filter_state, | ||
self.filter_5.actual_filter_state, | ||
self.filter_6.actual_filter_state, | ||
self.filter_7.actual_filter_state, | ||
self.filter_8.actual_filter_state, | ||
self.filter_9.actual_filter_state, | ||
self.filter_10.actual_filter_state, | ||
self.filter_11.actual_filter_state, | ||
self.filter_12.actual_filter_state, | ||
self.filter_13.actual_filter_state, | ||
self.filter_14.actual_filter_state, | ||
self.filter_15.actual_filter_state, | ||
self.filter_16.actual_filter_state, | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,101 @@ | ||
from ophyd import Component, Device, EpicsSignal, EpicsSignalRO, EpicsSignalWithRBV | ||
from enum import Enum | ||
|
||
from ophyd import ( | ||
Component, | ||
Device, | ||
EpicsSignal, | ||
EpicsSignalRO, | ||
EpicsSignalWithRBV, | ||
Signal, | ||
) | ||
from ophyd.status import Status | ||
|
||
from dodal.devices.status import await_value_in_list | ||
from dodal.devices.xspress3_mini.xspress3_mini_channel import Xspress3MiniChannel | ||
from dodal.log import LOGGER | ||
|
||
|
||
class TriggerMode(Enum): | ||
SOFTWARE = "Software" | ||
HARDWARE = "Hardware" | ||
BURST = "Burst" | ||
TTL_Veto_Only = "TTL_Veto_Only" | ||
IDC = "IDC" | ||
SOTWARE_START_STOP = "Software_Start/Stop" | ||
TTL_BOTH = "TTL_Both" | ||
LVDS_VETO_ONLY = "LVDS_Veto_Only" | ||
LVDS_both = "LVDS_Both" | ||
|
||
|
||
class UpdateRBV(Enum): | ||
DISABLED = "Disabled" | ||
ENABLED = "Enabled" | ||
|
||
|
||
class EraseState(Enum): | ||
DONE = "Done" | ||
ERASE = "Erase" | ||
|
||
|
||
class AcquireState(Enum): | ||
DONE = "Done" | ||
ACQUIRE = "Acquire" | ||
|
||
|
||
class DetectorState(Enum): | ||
ACQUIRE = "Acquire" | ||
CORRECT = "Correct" | ||
READOUT = "Readout" | ||
ABORTING = "Aborting" | ||
|
||
IDLE = "Idle" | ||
SAVING = "Saving" | ||
ERROR = "Error" | ||
INTILTIALIZING = "Initializing" | ||
DISCONNECTED = "Disconnected" | ||
ABORTED = "Aborted" | ||
|
||
|
||
class Xspress3Mini(Device): | ||
class ArmingSignal(Signal): | ||
def set(self, value, *, timeout=None, settle_time=None, **kwargs): | ||
return self.parent.arm() | ||
|
||
do_arm: ArmingSignal = Component(ArmingSignal) | ||
|
||
# Assume only one channel for now | ||
channel_1 = Component(Xspress3MiniChannel, "C1_") | ||
|
||
erase: EpicsSignal = Component(EpicsSignal, "ERASE") | ||
get_max_num_channels = Component(EpicsSignalRO, "MAX_NUM_CHANNELS_RBV") | ||
|
||
acquire: EpicsSignal = Component(EpicsSignal, "Acquire") | ||
|
||
get_roi_calc_mini: EpicsSignal = Component(EpicsSignal, "MCA1:Enable_RBV") | ||
|
||
NUMBER_ROIS_DEFAULT = 6 | ||
|
||
trigger_mode_mini: EpicsSignalWithRBV = Component(EpicsSignalWithRBV, "TriggerMode") | ||
|
||
roi_start_x: EpicsSignal = Component(EpicsSignal, "ROISUM1:MinX") | ||
roi_size_x: EpicsSignal = Component(EpicsSignal, "ROISUM1:SizeX") | ||
acquire_time: EpicsSignal = Component(EpicsSignal, "AcquireTime") | ||
detector_state: EpicsSignalRO = Component(EpicsSignalRO, ":DetectorState_RBV") | ||
NUMBER_ROIS_DEFAULT = 6 | ||
acquire_status: Status = None | ||
|
||
detector_busy_states = [ | ||
DetectorState.ACQUIRE.value, | ||
DetectorState.CORRECT.value, | ||
DetectorState.ABORTING.value, | ||
] | ||
|
||
def stage(self): | ||
self.arm().wait(timeout=10) | ||
|
||
def do_start(self) -> Status: | ||
self.erase.put(EraseState.ERASE.value) | ||
status = self.channel_1.update_arrays.set(AcquireState.DONE.value) | ||
self.acquire_status = self.acquire.set(AcquireState.ACQUIRE.value) | ||
return status | ||
|
||
def arm(self) -> Status: | ||
LOGGER.info("Arming Xspress3Mini detector...") | ||
self.trigger_mode_mini.put(TriggerMode.BURST.value) | ||
self.do_start().wait(timeout=10) | ||
arm_status = await_value_in_list(self.detector_state, self.detector_busy_states) | ||
return arm_status |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
from unittest.mock import MagicMock | ||
|
||
import pytest | ||
from bluesky import RunEngine | ||
from bluesky import plan_stubs as bps | ||
from ophyd.sim import make_fake_device | ||
from ophyd.status import Status | ||
|
||
from dodal.devices.attenuator import Attenuator | ||
|
||
CALCULATED_VALUE = range(0, 17) | ||
|
||
|
||
@pytest.fixture | ||
def fake_attenuator(): | ||
FakeAttenuator: Attenuator = make_fake_device(Attenuator) | ||
fake_attenuator: Attenuator = FakeAttenuator(name="attenuator") | ||
|
||
def mock_apply_values(val: int): | ||
actual_states = fake_attenuator.get_actual_filter_state_list() | ||
calculated_states = fake_attenuator.get_calculated_filter_state_list() | ||
for i in range(16): | ||
calculated_states[i].sim_put( | ||
CALCULATED_VALUE[i] | ||
) # Ignore the actual calculation as this is EPICS layer | ||
actual_states[i].sim_put(calculated_states[i].get()) | ||
return Status(done=True, success=True) | ||
|
||
fake_attenuator.change.set = MagicMock(side_effect=mock_apply_values) | ||
|
||
return fake_attenuator | ||
|
||
|
||
def test_set_transmission_success(fake_attenuator: Attenuator): | ||
fake_attenuator.set(1.0).wait(1) | ||
|
||
|
||
def test_set_transmission_in_run_engine(fake_attenuator: Attenuator): | ||
RE = RunEngine() | ||
RE(bps.abs_set(fake_attenuator, 1, wait=True)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.