Skip to content

Added I23ZoomController to account for the differing PV names #2097

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

Open
adaudon wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Added I23ZoomController to account for the differing PV names #2097

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 15 additions & 4 deletions src/dodal/beamlines/i23.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,13 @@
from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
from dodal.common.beamlines.device_helpers import HDF5_SUFFIX
from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
from dodal.devices.motors import XYZWrappedOmegaStage
from dodal.device_manager import DeviceManager
from dodal.devices.motors import SixAxisGonio
from dodal.devices.oav.oav_detector import OAVBeamCentreFile
from dodal.devices.oav.oav_detector import (
NullZoomController,
OAVBeamCentreFile,
)
from dodal.devices.oav.oav_parameters import OAVConfigBeamCentre
from dodal.devices.oav.pin_image_recognition import PinTipDetection
from dodal.devices.positioner import Positioner1D
Expand All @@ -26,6 +30,12 @@
from dodal.log import set_beamline as set_log_beamline
from dodal.utils import BeamlinePrefix, get_beamline_name, get_hostname

ZOOM_PARAMS_FILE = (
"/dls_sw/i23/software/gda_versions/gda/config/xml/jCameraManZoomLevels.xml"
)
DISPLAY_CONFIG = "/dls_sw/i23/software/daq_configuration/domain/display.configuration"
I23_CONFIG_SERVER_ENDPOINT = "https://i23-daq-config.diamond.ac.uk"

BL = get_beamline_name("i23")
PREFIX = BeamlinePrefix(BL)
set_log_beamline(BL)
Expand Down Expand Up @@ -72,12 +82,13 @@ def _is_i23_machine():

@devices.factory()
def oav(config_client) -> OAVBeamCentreFile:
zoom = NullZoomController()
return OAVBeamCentreFile(
prefix=f"{PREFIX.beamline_prefix}-DI-OAV-01:",
config=OAVConfigBeamCentre(ZOOM_PARAMS_FILE, DISPLAY_CONFIG, config_client),
zoom_controller=zoom,
)


@devices.factory()
def pin_tip_detection() -> PinTipDetection:
return PinTipDetection(f"{PREFIX.beamline_prefix}-DI-OAV-01:")
Expand All @@ -89,8 +100,8 @@ def shutter() -> MXZebraShutter:


@devices.factory()
def gonio() -> SixAxisGonio:
return SixAxisGonio(f"{PREFIX.beamline_prefix}-MO-GONIO-01:")
def gonio() -> XYZWrappedOmegaStage:
return XYZWrappedOmegaStage(f"{PREFIX.beamline_prefix}-MO-GONIO-01:")


@devices.factory()
Expand Down
Loading