Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removed setting the flatfield on zoom level changes #803

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+1 −66
Open

Removed setting the flatfield on zoom level changes #803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
925bd43
Removed setting the flatfield on zoom level changes
DominicOram Sep 24, 2024
2069797
Merge branch 'main' into 801_remove_setting_flatfield
DominicOram Sep 30, 2024
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
16 changes: 1 addition & 15 deletions src/dodal/devices/oav/oav_detector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
OverlayPlugin,
ProcessPlugin,
ROIPlugin,
Signal,
StatusBase,
)

Expand All @@ -35,8 +34,6 @@ class ZoomController(Device):

# Level is the string description of the zoom level e.g. "1.0x"
level = Component(EpicsSignal, "MP:SELECT", string=True)
# Used by OAV to work out if we're changing the setpoint
_level_sp = Component(Signal)

zrst = Component(EpicsSignal, "MP:SELECT.ZRST")
onst = Component(EpicsSignal, "MP:SELECT.ONST")
Expand All @@ -46,14 +43,6 @@ class ZoomController(Device):
fvst = Component(EpicsSignal, "MP:SELECT.FVST")
sxst = Component(EpicsSignal, "MP:SELECT.SXST")

def set_flatfield_on_zoom_level_one(self, value):
self.parent: OAV
flat_applied = self.parent.proc.port_name.get()
no_flat_applied = self.parent.cam.port_name.get()
return self.parent.grid_snapshot.input_plugin.set(
flat_applied if value == "1.0x" else no_flat_applied
)

@property
def allowed_zoom_levels(self):
return [
Expand All @@ -67,10 +56,7 @@ def allowed_zoom_levels(self):
]

def set(self, level_to_set: str) -> StatusBase:
return_status = self._level_sp.set(level_to_set)
return_status &= self.level.set(level_to_set)
return_status &= self.set_flatfield_on_zoom_level_one(level_to_set)
return return_status
return self.level.set(level_to_set)


class OAV(AreaDetector):
Expand Down
29 changes: 0 additions & 29 deletions tests/devices/unit_tests/oav/test_oav.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
from unittest.mock import MagicMock

import pytest
from ophyd.sim import instantiate_fake_device
from ophyd.status import AndStatus, Status

from dodal.devices.oav.oav_detector import OAV, OAVConfigParams
from dodal.devices.oav.oav_errors import (
Expand Down Expand Up @@ -36,32 +33,6 @@ def oav() -> OAV:
return oav


@pytest.mark.parametrize(
"zoom, expected_plugin",
[
("1.0x", "proc"),
("7.0x", "CAM"),
],
)
def test_when_zoom_level_changed_then_oav_rewired(zoom, expected_plugin, oav: OAV):
oav.zoom_controller.set(zoom).wait()

assert oav.grid_snapshot.input_plugin.get() == expected_plugin


def test_when_zoom_level_changed_then_status_waits_for_all_plugins_to_be_updated(
oav: OAV,
):
mjpg_status = Status("mjpg - test_when_zoom_level...")
oav.grid_snapshot.input_plugin.set = MagicMock(return_value=mjpg_status)

assert isinstance(full_status := oav.zoom_controller.set("1.0x"), AndStatus)
assert mjpg_status in full_status

mjpg_status.set_finished()
full_status.wait()


def test_load_microns_per_pixel_entry_not_found(oav: OAV):
with pytest.raises(OAVError_ZoomLevelNotFound):
oav.parameters.load_microns_per_pixel(0.000001, 0, 0)
Expand Down
22 changes: 0 additions & 22 deletions tests/devices/unit_tests/test_oav.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import numpy as np
import pytest
from bluesky import plan_stubs as bps
from bluesky.run_engine import RunEngine
from ophyd.sim import instantiate_fake_device, make_fake_device
from ophyd_async.core import set_mock_value
Expand Down Expand Up @@ -165,27 +164,6 @@ def test_bottom_right_from_top_left():
assert bottom_right[0] == 198 and bottom_right[1] == 263


def test_when_zoom_1_then_flat_field_applied(fake_oav: OAV, RE: RunEngine):
RE(bps.abs_set(fake_oav.zoom_controller, "1.0x"))
assert fake_oav.grid_snapshot.input_plugin.get() == "PROC"


def test_when_zoom_not_1_then_flat_field_removed(fake_oav: OAV, RE: RunEngine):
RE(bps.abs_set(fake_oav.zoom_controller, "10.0x"))
assert fake_oav.grid_snapshot.input_plugin.get() == "CAM"


def test_when_zoom_is_externally_changed_to_1_then_flat_field_not_changed(
fake_oav: OAV,
):
"""This test is required to ensure that Hyperion doesn't cause unexpected behaviour
e.g. change the flatfield when the zoom level is changed through the synoptic"""
fake_oav.grid_snapshot.input_plugin.sim_put("CAM") # type: ignore

fake_oav.zoom_controller.level.sim_put("1.0x") # type: ignore
assert fake_oav.grid_snapshot.input_plugin.get() == "CAM"


def test_get_beam_position_from_zoom_only_called_once_on_multiple_connects(
fake_oav: OAV,
):
Expand Down
Loading