mx-bluesky 1.4.7__py3-none-any.whl → 1.4.9__py3-none-any.whl

mx_bluesky/{hyperion → common}/device_setup_plans/manipulate_sample.py

@@ -7,7 +7,7 @@ from dodal.devices.aperturescatterguard import (
 )
 from dodal.devices.backlight import Backlight, BacklightPosition
 from dodal.devices.detector.detector_motion import DetectorMotion
-from dodal.devices.smargon import Smargon
+from dodal.devices.smargon import CombinedMove, Smargon
 
 from mx_bluesky.common.utils.log import LOGGER
 
@@ -47,7 +47,7 @@ def move_aperture_if_required(
     else:
         LOGGER.info(f"Setting aperture position to {aperture_value}")
         yield from bps.abs_set(
-            aperture_scatterguard,
+            aperture_scatterguard.selected_aperture,
             aperture_value,
             group=group,
         )
@@ -78,12 +78,7 @@ def move_x_y_z(
     axes are optional."""
 
     LOGGER.info(f"Moving smargon to x, y, z: {(x_mm, y_mm, z_mm)}")
-    if x_mm is not None:
-        yield from bps.abs_set(smargon.x, x_mm, group=group)
-    if y_mm is not None:
-        yield from bps.abs_set(smargon.y, y_mm, group=group)
-    if z_mm is not None:
-        yield from bps.abs_set(smargon.z, z_mm, group=group)
+    yield from bps.abs_set(smargon, CombinedMove(x=x_mm, y=y_mm, z=z_mm), group=group)
     if wait:
         yield from bps.wait(group)
 
@@ -100,11 +95,8 @@ def move_phi_chi_omega(
     axes are optional."""
 
     LOGGER.info(f"Moving smargon to phi, chi, omega: {(phi, chi, omega)}")
-    if phi is not None:
-        yield from bps.abs_set(smargon.phi, phi, group=group)
-    if chi is not None:
-        yield from bps.abs_set(smargon.chi, chi, group=group)
-    if omega is not None:
-        yield from bps.abs_set(smargon.omega, omega, group=group)
+    yield from bps.abs_set(
+        smargon, CombinedMove(phi=phi, chi=chi, omega=omega), group=group
+    )
     if wait:
         yield from bps.wait(group)

mx_bluesky/{hyperion → common}/device_setup_plans/setup_oav.py

@@ -6,15 +6,18 @@ from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.oav.oav_parameters import OAVParameters
 from dodal.devices.oav.pin_image_recognition import PinTipDetection
 
-from mx_bluesky.hyperion.parameters.constants import CONST
-
-# Helper function to make sure we set the waiting groups correctly
-set_using_group = partial(bps.abs_set, group=CONST.WAIT.READY_FOR_OAV)
+from mx_bluesky.common.parameters.constants import (
+    PlanGroupCheckpointConstants,
+)
 
 
 def setup_pin_tip_detection_params(
-    pin_tip_detect_device: PinTipDetection, parameters: OAVParameters
+    pin_tip_detect_device: PinTipDetection,
+    parameters: OAVParameters,
 ):
+    set_using_group = partial(
+        bps.abs_set, group=PlanGroupCheckpointConstants.READY_FOR_OAV
+    )
     # select which blur to apply to image
     yield from set_using_group(
         pin_tip_detect_device.preprocess_operation, parameters.preprocess
@@ -55,6 +58,9 @@ def setup_pin_tip_detection_params(
 
 
 def setup_general_oav_params(oav: OAV, parameters: OAVParameters):
+    set_using_group = partial(
+        bps.abs_set, group=PlanGroupCheckpointConstants.READY_FOR_OAV
+    )
     yield from set_using_group(oav.cam.color_mode, ColorMode.RGB1)
     yield from set_using_group(oav.cam.acquire_period, parameters.acquire_period)
     yield from set_using_group(oav.cam.acquire_time, parameters.exposure)
@@ -78,4 +84,4 @@ def pre_centring_setup_oav(
     """
     yield from setup_general_oav_params(oav, parameters)
     yield from setup_pin_tip_detection_params(pin_tip_detection_device, parameters)
-    yield from bps.wait(CONST.WAIT.READY_FOR_OAV)
+    yield from bps.wait(PlanGroupCheckpointConstants.READY_FOR_OAV)

mx_bluesky/{hyperion → common}/experiment_plans/change_aperture_then_move_plan.py

@@ -3,18 +3,17 @@ import numpy
 from dodal.devices.aperturescatterguard import ApertureScatterguard, ApertureValue
 from dodal.devices.smargon import Smargon, StubPosition
 
+from mx_bluesky.common.device_setup_plans.manipulate_sample import move_x_y_z
 from mx_bluesky.common.utils.log import LOGGER
 from mx_bluesky.common.utils.tracing import TRACER
 from mx_bluesky.common.xrc_result import XRayCentreResult
-from mx_bluesky.hyperion.device_setup_plans.manipulate_sample import move_x_y_z
-from mx_bluesky.hyperion.parameters.gridscan import HyperionSpecifiedThreeDGridScan
 
 
 def change_aperture_then_move_to_xtal(
     best_hit: XRayCentreResult,
     smargon: Smargon,
     aperture_scatterguard: ApertureScatterguard,
-    parameters: HyperionSpecifiedThreeDGridScan | None = None,
+    set_stub_offsets: bool | None = None,
 ):
     """For the given x-ray centring result,
     * Change the aperture so that the beam size is comparable to the crystal size
@@ -36,7 +35,7 @@ def change_aperture_then_move_to_xtal(
 
     # TODO support for setting stub offsets in multipin
     # https://github.com/DiamondLightSource/mx-bluesky/issues/552
-    if parameters and parameters.FGS_params.set_stub_offsets:
+    if set_stub_offsets:
         LOGGER.info("Recentring smargon co-ordinate system to this point.")
         yield from bps.mv(smargon.stub_offsets, StubPosition.CURRENT_AS_CENTER)
 
@@ -72,4 +71,4 @@ def set_aperture_for_bbox_mm(
         f"Setting aperture to {new_selected_aperture} based on bounding box size {bbox_size_mm}."
     )
 
-    yield from bps.abs_set(aperture_device, new_selected_aperture)
+    yield from bps.abs_set(aperture_device.selected_aperture, new_selected_aperture)

mx_bluesky/{hyperion → common}/experiment_plans/oav_grid_detection_plan.py

@@ -14,13 +14,13 @@ from dodal.devices.oav.pin_image_recognition.utils import NONE_VALUE
 from dodal.devices.oav.utils import PinNotFoundException, wait_for_tip_to_be_found
 from dodal.devices.smargon import Smargon
 
+from mx_bluesky.common.device_setup_plans.setup_oav import (
+    pre_centring_setup_oav,
+)
+from mx_bluesky.common.parameters.constants import DocDescriptorNames, HardwareConstants
 from mx_bluesky.common.utils.context import device_composite_from_context
 from mx_bluesky.common.utils.exceptions import catch_exception_and_warn
 from mx_bluesky.common.utils.log import LOGGER
-from mx_bluesky.hyperion.device_setup_plans.setup_oav import (
-    pre_centring_setup_oav,
-)
-from mx_bluesky.hyperion.parameters.constants import CONST
 
 if TYPE_CHECKING:
     from dodal.devices.oav.oav_parameters import OAVParameters
@@ -103,7 +103,7 @@ def grid_detection_plan(
         yield from bps.mv(smargon.omega, angle)
         # need to wait for the OAV image to update
         # See #673 for improvements
-        yield from bps.sleep(CONST.HARDWARE.OAV_REFRESH_DELAY)
+        yield from bps.sleep(HardwareConstants.OAV_REFRESH_DELAY)
 
         tip_x_px, tip_y_px = yield from catch_exception_and_warn(
             PinNotFoundException, wait_for_tip_to_be_found, pin_tip_detection
@@ -163,7 +163,7 @@ def grid_detection_plan(
         yield from bps.abs_set(oav.grid_snapshot.filename, snapshot_filename)
         yield from bps.abs_set(oav.grid_snapshot.directory, snapshot_dir)
         yield from bps.trigger(oav.grid_snapshot, wait=True)
-        yield from bps.create(CONST.DESCRIPTORS.OAV_GRID_SNAPSHOT_TRIGGERED)
+        yield from bps.create(DocDescriptorNames.OAV_GRID_SNAPSHOT_TRIGGERED)
 
         yield from bps.read(oav)
         yield from bps.read(smargon)

mx_bluesky/common/external_interaction/callbacks/common/ispyb_callback_base.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 from abc import abstractmethod
 from collections.abc import Callable, Sequence
+from pathlib import Path
 from typing import TYPE_CHECKING, Any, TypeVar, cast
 
 from dodal.beamline_specific_utils.i03 import beam_size_from_aperture
@@ -26,7 +27,7 @@ from mx_bluesky.common.external_interaction.ispyb.ispyb_store import (
 )
 from mx_bluesky.common.external_interaction.ispyb.ispyb_utils import get_ispyb_config
 from mx_bluesky.common.parameters.components import DiffractionExperimentWithSample
-from mx_bluesky.common.parameters.constants import DocDescriptorNames, SimConstants
+from mx_bluesky.common.parameters.constants import DocDescriptorNames
 from mx_bluesky.common.utils.log import ISPYB_ZOCALO_CALLBACK_LOGGER, set_dcgid_tag
 from mx_bluesky.common.utils.utils import convert_eV_to_angstrom
 
@@ -70,10 +71,10 @@ class BaseISPyBCallback(PlanReactiveCallback):
         self.ispyb: StoreInIspyb
         self.descriptors: dict[str, EventDescriptor] = {}
         self.ispyb_config = get_ispyb_config()
-        if (
-            self.ispyb_config == SimConstants.ISPYB_CONFIG
-            or self.ispyb_config == SimConstants.DEV_ISPYB_DATABASE_CFG
-        ):
+        ISPYB_ZOCALO_CALLBACK_LOGGER.info(
+            f"Using ISPyB configuration from {self.ispyb_config}"
+        )
+        if not self.ispyb_config or not Path(self.ispyb_config).is_absolute():
             ISPYB_ZOCALO_CALLBACK_LOGGER.warning(
                 f"{self.__class__} using dev ISPyB config: {self.ispyb_config}. If you"
                 "want to use the real database, please set the ISPYB_CONFIG_PATH "

mx_bluesky/common/external_interaction/callbacks/xray_centre/ispyb_callback.py

@@ -4,13 +4,8 @@ from collections.abc import Callable, Sequence
 from time import time
 from typing import TYPE_CHECKING, Any, TypeVar
 
-import numpy as np
 from bluesky import preprocessors as bpp
-from bluesky.utils import MsgGenerator
-from dodal.devices.zocalo.zocalo_results import (
-    ZOCALO_READING_PLAN_NAME,
-    get_processing_results_from_event,
-)
+from bluesky.utils import MsgGenerator, make_decorator
 
 from mx_bluesky.common.external_interaction.callbacks.common.ispyb_callback_base import (
     BaseISPyBCallback,
@@ -19,9 +14,6 @@ from mx_bluesky.common.external_interaction.callbacks.common.ispyb_mapping impor
     populate_data_collection_group,
     populate_remaining_data_collection_info,
 )
-from mx_bluesky.common.external_interaction.callbacks.common.logging_callback import (
-    format_doc_for_log,
-)
 from mx_bluesky.common.external_interaction.callbacks.xray_centre.ispyb_mapping import (
     construct_comment_for_gridscan,
     populate_xy_data_collection_info,
@@ -71,6 +63,9 @@ def ispyb_activation_wrapper(plan_generator: MsgGenerator, parameters):
     )
 
 
+ispyb_activation_decorator = make_decorator(ispyb_activation_wrapper)
+
+
 class GridscanISPyBCallback(BaseISPyBCallback):
     """Callback class to handle the deposition of experiment parameters into the ISPyB
     database. Listens for 'event' and 'descriptor' documents. Creates the ISpyB entry on
@@ -103,6 +98,7 @@ class GridscanISPyBCallback(BaseISPyBCallback):
     def activity_gated_start(self, doc: RunStart):
         if doc.get("subplan_name") == PlanNameConstants.DO_FGS:
             self._start_of_fgs_uid = doc.get("uid")
+
         if doc.get("subplan_name") == PlanNameConstants.GRID_DETECT_AND_DO_GRIDSCAN:
             self.uid_to_finalize_on = doc.get("uid")
             ISPYB_ZOCALO_CALLBACK_LOGGER.info(
@@ -146,12 +142,11 @@ class GridscanISPyBCallback(BaseISPyBCallback):
 
     def activity_gated_event(self, doc: Event):
         assert self.data_collection_group_info, ASSERT_START_BEFORE_EVENT_DOC_MESSAGE
+
         doc = super().activity_gated_event(doc)
 
         descriptor_name = self.descriptors[doc["descriptor"]].get("name")
-        if descriptor_name == ZOCALO_READING_PLAN_NAME:
-            self._handle_zocalo_read_event(doc)
-        elif descriptor_name == DocDescriptorNames.OAV_GRID_SNAPSHOT_TRIGGERED:
+        if descriptor_name == DocDescriptorNames.OAV_GRID_SNAPSHOT_TRIGGERED:
             scan_data_infos = self._handle_oav_grid_snapshot_triggered(doc)
             self.ispyb_ids = self.ispyb.update_deposition(
                 self.ispyb_ids, scan_data_infos
@@ -162,38 +157,10 @@ class GridscanISPyBCallback(BaseISPyBCallback):
 
         return doc
 
-    def _handle_zocalo_read_event(self, doc):
+    def _add_processing_time_to_comment(self, processing_start_time: float):
         assert self.data_collection_group_info, ASSERT_START_BEFORE_EVENT_DOC_MESSAGE
-        crystal_summary = ""
-        if self._processing_start_time is not None:
-            proc_time = time() - self._processing_start_time
-            crystal_summary = f"Zocalo processing took {proc_time:.2f} s. "
-        bboxes: list[np.ndarray] = []
-        ISPYB_ZOCALO_CALLBACK_LOGGER.info(
-            f"Amending comment based on Zocalo reading doc: {format_doc_for_log(doc)}"
-        )
-
-        raw_results = get_processing_results_from_event("zocalo", doc)
-        if len(raw_results) > 0:
-            for n, res in enumerate(raw_results):
-                bb = res["bounding_box"]
-                diff = np.array(bb[1]) - np.array(bb[0])
-                bboxes.append(diff)
-
-                nicely_formatted_com = [
-                    f"{np.round(com, 2)}" for com in res["centre_of_mass"]
-                ]
-                crystal_summary += (
-                    f"Crystal {n + 1}: "
-                    f"Strength {res['total_count']}; "
-                    f"Position (grid boxes) {nicely_formatted_com}; "
-                    f"Size (grid boxes) {bboxes[n]}; "
-                )
-        else:
-            crystal_summary += "Zocalo found no crystals in this gridscan."
-        assert self.ispyb_ids.data_collection_ids, (
-            "No data collection to add results to"
-        )
+        proc_time = time() - processing_start_time
+        crystal_summary = f"Zocalo processing took {proc_time:.2f} s."
 
         self.data_collection_group_info.comments = (
             self.data_collection_group_info.comments or ""
@@ -320,10 +287,12 @@ class GridscanISPyBCallback(BaseISPyBCallback):
             if exception_type:
                 doc["reason"] = message
                 self.data_collection_group_info.comments = message
-                self.ispyb.update_data_collection_group_table(
-                    self.data_collection_group_info,
-                    self.ispyb_ids.data_collection_group_id,
-                )
+            elif self._processing_start_time:
+                self._add_processing_time_to_comment(self._processing_start_time)
+            self.ispyb.update_data_collection_group_table(
+                self.data_collection_group_info,
+                self.ispyb_ids.data_collection_group_id,
+            )
             self.data_collection_group_info = None
             return super().activity_gated_stop(doc)
         return self._tag_doc(doc)

mx_bluesky/common/external_interaction/ispyb/ispyb_store.py

@@ -6,6 +6,7 @@ from typing import TYPE_CHECKING
 
 import ispyb
 import ispyb.sqlalchemy
+import numpy as np
 from ispyb.connector.mysqlsp.main import ISPyBMySQLSPConnector as Connector
 from ispyb.sp.mxacquisition import MXAcquisition
 from ispyb.strictordereddict import StrictOrderedDict
@@ -280,7 +281,9 @@ class StoreInIspyb:
                 conn, data_collection_info.visit_string
             )
         params |= {
-            k: v for k, v in asdict(data_collection_info).items() if k != "visit_string"
+            k: v.item() if isinstance(v, np.generic) else v  # Convert to native types
+            for k, v in asdict(data_collection_info).items()
+            if k != "visit_string"
         }
 
         return params

mx_bluesky/common/external_interaction/ispyb/ispyb_utils.py

@@ -7,11 +7,11 @@ from ispyb import NoResult
 from ispyb.connector.mysqlsp.main import ISPyBMySQLSPConnector as Connector
 from ispyb.sp.core import Core
 
-from mx_bluesky.common.parameters.constants import SimConstants
 
-
-def get_ispyb_config():
-    return os.environ.get("ISPYB_CONFIG_PATH", SimConstants.ISPYB_CONFIG)
+def get_ispyb_config() -> str:
+    ispyb_config = os.environ.get("ISPYB_CONFIG_PATH")
+    assert ispyb_config, "ISPYB_CONFIG_PATH must be set"
+    return ispyb_config
 
 
 def get_session_id_from_visit(conn: Connector, visit: str):

mx_bluesky/common/external_interaction/nexus/nexus_utils.py

@@ -158,6 +158,6 @@ def create_beam_and_attenuator_parameters(
         tuple[Beam, Attenuator]: Descriptions of the beam and attenuator for nexgen.
     """
     return (
-        Beam(convert_eV_to_angstrom(energy_kev * 1000), flux),  # pyright: ignore
-        Attenuator(transmission_fraction),  # pyright: ignore
+        Beam(wavelength=convert_eV_to_angstrom(energy_kev * 1000), flux=flux),
+        Attenuator(transmission=transmission_fraction),
     )

mx_bluesky/common/parameters/components.py

@@ -5,7 +5,7 @@ from abc import abstractmethod
 from collections.abc import Sequence
 from enum import StrEnum
 from pathlib import Path
-from typing import Literal, SupportsInt, cast
+from typing import Literal, Self, SupportsInt, cast
 
 from dodal.devices.aperturescatterguard import ApertureValue
 from dodal.devices.detector import (
@@ -114,12 +114,32 @@ class MxBlueskyParameters(BaseModel):
 
 
 class WithSnapshot(BaseModel):
+    """
+    Configures how snapshot images are created.
+    Attributes:
+        snapshot_directory: Path to the directory where snapshot images will be stored
+        snapshot_omegas_deg: list of omega values at which snapshots will be taken. For
+            gridscans, this attribute is ignored.
+        use_grid_snapshots: This may be specified for rotation snapshots to speed up rotation
+            execution. If set to True then rotation snapshots are generated from the
+            previously captured grid snapshots. Otherwise they are captured using
+            freshly captured snapshots during the rotation plan.
+    """
+
     snapshot_directory: Path
     snapshot_omegas_deg: list[float] | None = None
+    use_grid_snapshots: bool = False
 
     @property
     def take_snapshots(self) -> bool:
-        return bool(self.snapshot_omegas_deg)
+        return bool(self.snapshot_omegas_deg) or self.use_grid_snapshots
+
+    @model_validator(mode="after")
+    def _validate_omegas_with_grid_snapshots(self) -> Self:
+        assert not self.use_grid_snapshots or self.snapshot_omegas_deg is None, (
+            "snapshot_omegas may not be specified with use_grid_snapshots"
+        )
+        return self
 
 
 class WithOptionalEnergyChange(BaseModel):

mx_bluesky/common/parameters/constants.py

@@ -55,6 +55,7 @@ class PlanNameConstants:
     ROBOT_LOAD_AND_SNAPSHOTS = "robot_load_and_snapshots"
     # Rotation scan
     ROTATION_MULTI = "multi_rotation_wrapper"
+    ROTATION_MULTI_OUTER = "multi_rotation_outer"
     ROTATION_OUTER = "rotation_scan_with_cleanup"
     ROTATION_MAIN = "rotation_scan_main"
     FLYSCAN_RESULTS = "xray_centre_results"
@@ -67,17 +68,12 @@ class EnvironmentConstants:
     ZOCALO_ENV = ZOCALO_ENV_FROM_DODAL
 
 
-@dataclass(frozen=True)
-class TriggerConstants:
-    ZOCALO = "trigger_zocalo_on"
-
-
 @dataclass(frozen=True)
 class HardwareConstants:
     OAV_REFRESH_DELAY = 0.3
     PANDA_FGS_RUN_UP_DEFAULT = 0.17
     CRYOJET_MARGIN_MM = 0.2
-    THAWING_TIME = 20
+    THAWING_TIME = 40
     TIP_OFFSET_UM = 0
 
     # Value quoted in https://www.dectris.com/en/detectors/x-ray-detectors/eiger2/eiger2-for-synchrotrons/eiger2-x/,
@@ -94,6 +90,7 @@ class GridscanParamConstants:
     OMEGA_1 = 0.0
     OMEGA_2 = 90.0
     PANDA_RUN_UP_DISTANCE_MM = 0.2
+    ZOCALO_MIN_TOTAL_COUNT_THRESHOLD = 3
 
 
 @dataclass(frozen=True)
@@ -125,6 +122,7 @@ class PlanGroupCheckpointConstants:
     ROTATION_READY_FOR_DC = "rotation_ready_for_data_collection"
     MOVE_GONIO_TO_START = "move_gonio_to_start"
     READY_FOR_OAV = "ready_for_oav"
+    PREPARE_APERTURE = "prepare_aperture"
 
 
 # Eventually replace below with https://github.com/DiamondLightSource/mx-bluesky/issues/798
@@ -136,16 +134,6 @@ class DeviceSettingsConstants:
     )
 
 
-@dataclass(frozen=True)
-class SimConstants:
-    BEAMLINE = "BL03S"
-    INSERTION_PREFIX = "SR03S"
-    # this one is for unit tests
-    ISPYB_CONFIG = "tests/test_data/test_config.cfg"
-    # this one is for system tests
-    DEV_ISPYB_DATABASE_CFG = "/dls_sw/dasc/mariadb/credentials/ispyb-hyperion-dev.cfg"
-
-
 class Actions(Enum):
     START = "start"
     STOP = "stop"

mx_bluesky/common/parameters/gridscan.py

@@ -26,7 +26,11 @@ from mx_bluesky.common.parameters.constants import (
     HardwareConstants,
 )
 
-DETECTOR_SIZE_PER_BEAMLINE = {"i02-1": EIGER2_X_9M_SIZE, "dev": EIGER2_X_16M_SIZE}
+DETECTOR_SIZE_PER_BEAMLINE = {
+    "i02-1": EIGER2_X_9M_SIZE,
+    "dev": EIGER2_X_16M_SIZE,
+    "i03": EIGER2_X_16M_SIZE,
+}
 
 
 class GridCommon(
@@ -50,6 +54,37 @@ class GridCommon(
 
     tip_offset_um: float = Field(default=HardwareConstants.TIP_OFFSET_UM)
 
+    @property
+    def detector_params(self):
+        self.det_dist_to_beam_converter_path = (
+            self.det_dist_to_beam_converter_path
+            or DetectorParamConstants.BEAM_XY_LUT_PATH
+        )
+        optional_args = {}
+        if self.run_number:
+            optional_args["run_number"] = self.run_number
+        assert self.detector_distance_mm is not None, (
+            "Detector distance must be filled before generating DetectorParams"
+        )
+        return DetectorParams(
+            detector_size_constants=DETECTOR_SIZE_PER_BEAMLINE[
+                get_beamline_name("dev")
+            ],
+            expected_energy_ev=self.demand_energy_ev,
+            exposure_time_s=self.exposure_time_s,
+            directory=self.storage_directory,
+            prefix=self.file_name,
+            detector_distance=self.detector_distance_mm,
+            omega_start=self.omega_start_deg or 0,
+            omega_increment=0,
+            num_images_per_trigger=1,
+            num_triggers=self.num_images,
+            use_roi_mode=self.use_roi_mode,
+            det_dist_to_beam_converter_path=self.det_dist_to_beam_converter_path,
+            trigger_mode=self.trigger_mode,
+            **optional_args,
+        )
+
 
 class SpecifiedGrid(XyzStarts, WithScan):
     """A specified grid is one which has defined values for the start position,
@@ -150,34 +185,3 @@ class SpecifiedThreeDGridScan(
     @property
     def num_images(self) -> int:
         return len(self.scan_points["sam_x"])
-
-    @property
-    def detector_params(self):
-        self.det_dist_to_beam_converter_path = (
-            self.det_dist_to_beam_converter_path
-            or DetectorParamConstants.BEAM_XY_LUT_PATH
-        )
-        optional_args = {}
-        if self.run_number:
-            optional_args["run_number"] = self.run_number
-        assert self.detector_distance_mm is not None, (
-            "Detector distance must be filled before generating DetectorParams"
-        )
-        return DetectorParams(
-            detector_size_constants=DETECTOR_SIZE_PER_BEAMLINE[
-                get_beamline_name("dev")
-            ],
-            expected_energy_ev=self.demand_energy_ev,
-            exposure_time_s=self.exposure_time_s,
-            directory=self.storage_directory,
-            prefix=self.file_name,
-            detector_distance=self.detector_distance_mm,
-            omega_start=self.omega_start_deg or 0,
-            omega_increment=0,
-            num_images_per_trigger=1,
-            num_triggers=self.num_images,
-            use_roi_mode=self.use_roi_mode,
-            det_dist_to_beam_converter_path=self.det_dist_to_beam_converter_path,
-            trigger_mode=self.trigger_mode,
-            **optional_args,
-        )