mx-bluesky 1.4.5__py3-none-any.whl → 1.4.6__py3-none-any.whl

mx_bluesky/_version.py

@@ -1,8 +1,13 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
 else:
     VERSION_TUPLE = object
@@ -12,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.4.5'
-__version_tuple__ = version_tuple = (1, 4, 5)
+__version__ = version = '1.4.6'
+__version_tuple__ = version_tuple = (1, 4, 6)

mx_bluesky/beamlines/i04/redis_to_murko_forwarder.py

@@ -156,8 +156,15 @@ class RedisListener:
             sample_id = data["sample_id"]
 
             # Images are put in redis as raw jpeg bytes, murko needs numpy arrays
-            raw_image = self.redis_client.hget(f"murko:{sample_id}:raw", uuid)
-            assert isinstance(raw_image, bytes)
+            image_key = f"murko:{sample_id}:raw"
+            raw_image = self.redis_client.hget(image_key, uuid)
+
+            if not isinstance(raw_image, bytes):
+                LOGGER.warning(
+                    f"Image at {image_key}:{uuid} is {raw_image}, expected bytes. Ignoring the data"
+                )
+                return
+
             image = Image.open(io.BytesIO(raw_image))
             image = np.asarray(image)
 
@@ -173,6 +180,10 @@ class RedisListener:
             self._get_and_handle_message()
 
 
-if __name__ == "__main__":
+def main():
     client = RedisListener()
     client.listen_for_image_data_forever()
+
+
+if __name__ == "__main__":
+    main()

mx_bluesky/beamlines/i04/thawing_plan.py

@@ -24,21 +24,17 @@ def thaw_and_stream_to_redis(
     oav: OAV = inject("oav"),
     oav_to_redis_forwarder: OAVToRedisForwarder = inject("oav_to_redis_forwarder"),
 ) -> MsgGenerator:
-    zoom_percentage = yield from bps.rd(oav.zoom_controller.percentage)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+    zoom_percentage = yield from bps.rd(oav.zoom_controller.percentage)
     sample_id = yield from bps.rd(robot.sample_id)
 
     sample_id = int(sample_id)
-    zoom_level_before_thawing = yield from bps.rd(oav.zoom_controller.level)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+    zoom_level_before_thawing = yield from bps.rd(oav.zoom_controller.level)
 
-    yield from bps.mv(oav.zoom_controller.level, "1.0x")  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+    yield from bps.mv(oav.zoom_controller.level, "1.0x")
 
     def switch_forwarder_to_ROI() -> MsgGenerator:
         yield from bps.complete(oav_to_redis_forwarder, wait=True)
-        yield from bps.mv(
-            # See: https://github.com/bluesky/bluesky/issues/1809
-            oav_to_redis_forwarder.selected_source,  # type: ignore
-            Source.ROI.value,  # type: ignore
-        )
+        yield from bps.mv(oav_to_redis_forwarder.selected_source, Source.ROI.value)
         yield from bps.kickoff(oav_to_redis_forwarder, wait=True)
 
     microns_per_pixel_x = yield from bps.rd(oav.microns_per_pixel_x)
@@ -59,10 +55,10 @@ def thaw_and_stream_to_redis(
     )
     def _thaw_and_stream_to_redis():
         yield from bps.mv(
-            oav_to_redis_forwarder.sample_id,  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
-            sample_id,  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
-            oav_to_redis_forwarder.selected_source,  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
-            Source.FULL_SCREEN.value,  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+            oav_to_redis_forwarder.sample_id,
+            sample_id,
+            oav_to_redis_forwarder.selected_source,
+            Source.FULL_SCREEN.value,
         )
 
         yield from bps.kickoff(oav_to_redis_forwarder, wait=True)
@@ -74,7 +70,7 @@ def thaw_and_stream_to_redis(
         yield from bps.complete(oav_to_redis_forwarder)
 
     def cleanup():
-        yield from bps.mv(oav.zoom_controller.level, zoom_level_before_thawing)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+        yield from bps.mv(oav.zoom_controller.level, zoom_level_before_thawing)
 
     yield from bpp.contingency_wrapper(
         _thaw_and_stream_to_redis(),

mx_bluesky/beamlines/i24/serial/__init__.py

@@ -1,3 +1,11 @@
+from mx_bluesky.beamlines.i24.serial.web_gui_plans.general_plans import (
+    gui_gonio_move_on_click,
+    gui_move_detector,
+    gui_set_parameters,
+    gui_sleep,
+    gui_stage_move_on_click,
+)
+
 from .extruder.i24ssx_Extruder_Collect_py3v2 import (
     enter_hutch,
     initialise_extruder,
@@ -43,4 +51,10 @@ __all__ = [
     "pumpprobe_calc",
     "setup_collection_logs",
     "clean_up_log_config_at_end",
+    # GUI plans
+    "gui_stage_move_on_click",
+    "gui_gonio_move_on_click",
+    "gui_sleep",
+    "gui_move_detector",
+    "gui_set_parameters",
 ]

mx_bluesky/beamlines/i24/serial/dcid.py

@@ -213,7 +213,9 @@ class DCID:
                 "transmission": transmission,
                 "visit": self.parameters.visit.name,
                 "wavelength": beam_settings.wavelength_in_a,
-                "group": {"experimentType": self.parameters.ispyb_experiment_type},
+                "group": {
+                    "experimentType": self.parameters.ispyb_experiment_type.value
+                },
                 "xBeam": xbeam,
                 "yBeam": ybeam,
                 "ssx": {

mx_bluesky/beamlines/i24/serial/extruder/i24ssx_Extruder_Collect_py3v2.py

@@ -138,7 +138,7 @@ def enter_hutch(
     detector_stage: DetectorMotion = inject("detector_motion"),
 ) -> MsgGenerator:
     """Move the detector stage before entering hutch."""
-    yield from bps.mv(detector_stage.z, SAFE_DET_Z)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+    yield from bps.mv(detector_stage.z, SAFE_DET_Z)
     SSX_LOGGER.debug("Detector moved.")
 
 

mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Collect_py3v1.py

@@ -290,7 +290,9 @@ def get_prog_num(
 def set_datasize(
     parameters: FixedTargetParameters,
 ):
-    SSX_LOGGER.info("Setting PV to calculated total number of images")
+    SSX_LOGGER.info(
+        f"Setting PV to calculated total number of images: {parameters.total_num_images}"
+    )
 
     SSX_LOGGER.debug(f"Map type: {parameters.map_type}")
     SSX_LOGGER.debug(f"Chip type: {parameters.chip.chip_type}")
@@ -433,7 +435,8 @@ def start_i24(
 
         # DCID process depends on detector PVs being set up already
         SSX_LOGGER.debug("Start DCID process")
-        filetemplate = f"{parameters.filename}.nxs"
+        complete_filename = cagetstring(pv.eiger_ODfilenameRBV)
+        filetemplate = f"{complete_filename}.nxs"
         dcid.generate_dcid(
             beam_settings=beam_settings,
             image_dir=filepath,
@@ -707,7 +710,7 @@ def run_fixed_target_plan(
     parameters.collection_directory.mkdir(parents=True, exist_ok=True)
 
     if parameters.chip_map:
-        upload_chip_map_to_geobrick(pmac, parameters.chip_map)
+        yield from upload_chip_map_to_geobrick(pmac, parameters.chip_map)
 
     beam_center_device = sup.get_beam_center_device(parameters.detector_name)
 

mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Manager_py3v1.py

@@ -548,11 +548,11 @@ def moveto(place: str = "origin", pmac: PMAC = inject("pmac")) -> MsgGenerator:
     chip_move = CHIP_MOVES[chip_type]
 
     if place == Fiducials.origin:
-        yield from bps.mv(pmac.x, 0.0, pmac.y, 0.0)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+        yield from bps.mv(pmac.x, 0.0, pmac.y, 0.0)
     if place == Fiducials.fid1:
-        yield from bps.mv(pmac.x, chip_move, pmac.y, 0.0)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+        yield from bps.mv(pmac.x, chip_move, pmac.y, 0.0)
     if place == Fiducials.fid2:
-        yield from bps.mv(pmac.x, 0.0, pmac.y, chip_move)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+        yield from bps.mv(pmac.x, 0.0, pmac.y, chip_move)
 
 
 @log_on_entry
@@ -580,7 +580,7 @@ def moveto_preset(
     elif place == "collect_position":
         SSX_LOGGER.info("collect position")
         caput(pv.me14e_filter, 20)
-        yield from bps.mv(pmac.x, 0.0, pmac.y, 0.0, pmac.z, 0.0)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+        yield from bps.mv(pmac.x, 0.0, pmac.y, 0.0, pmac.z, 0.0)
         yield from bps.abs_set(
             beamstop.pos_select, BeamstopPositions.DATA_COLLECTION, group=place
         )
@@ -589,7 +589,7 @@ def moveto_preset(
 
     elif place == "microdrop_position":
         SSX_LOGGER.info("microdrop align position")
-        yield from bps.mv(pmac.x, 6.0, pmac.y, -7.8, pmac.z, 0.0)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+        yield from bps.mv(pmac.x, 6.0, pmac.y, -7.8, pmac.z, 0.0)
 
 
 @log_on_entry
@@ -665,15 +665,15 @@ def fiducial(point: int = 1, pmac: PMAC = inject("pmac")) -> MsgGenerator:
     output_param_path.mkdir(parents=True, exist_ok=True)
     SSX_LOGGER.info(f"Writing Fiducial File {output_param_path}/fiducial_{point}.txt")
     SSX_LOGGER.info("MTR\tRBV\tRAW\tCorr\tf_value")
-    SSX_LOGGER.info(f"MTR1\t{rbv_1:1.4f}\t{mtr1_dir:d}")
-    SSX_LOGGER.info(f"MTR2\t{rbv_2:1.4f}\t{mtr2_dir:d}")
-    SSX_LOGGER.info(f"MTR3\t{rbv_3:1.4f}\t{mtr3_dir:d}")
+    SSX_LOGGER.info(f"MTR1\t{rbv_1:1.4f}\t{mtr1_dir:f}")
+    SSX_LOGGER.info(f"MTR2\t{rbv_2:1.4f}\t{mtr2_dir:f}")
+    SSX_LOGGER.info(f"MTR3\t{rbv_3:1.4f}\t{mtr3_dir:f}")
 
     with open(output_param_path / f"fiducial_{point}.txt", "w") as f:
         f.write("MTR\tRBV\tCorr\n")
-        f.write(f"MTR1\t{rbv_1:1.4f}\t{mtr1_dir:d}\n")
-        f.write(f"MTR2\t{rbv_2:1.4f}\t{mtr2_dir:d}\n")
-        f.write(f"MTR3\t{rbv_3:1.4f}\t{mtr3_dir:d}")
+        f.write(f"MTR1\t{rbv_1:1.4f}\t{mtr1_dir:f}\n")
+        f.write(f"MTR2\t{rbv_2:1.4f}\t{mtr2_dir:f}\n")
+        f.write(f"MTR3\t{rbv_3:1.4f}\t{mtr3_dir:f}")
     SSX_LOGGER.info(f"Fiducial {point} set.")
     yield from bps.null()
 

mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_moveonclick.py

@@ -33,7 +33,7 @@ def _get_beam_centre(oav: OAV):
 
 def _calculate_zoom_calibrator(oav: OAV):
     """Set the scale for the zoom calibrator for the pmac moves."""
-    currentzoom = yield from bps.rd(oav.zoom_controller.percentage)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+    currentzoom = yield from bps.rd(oav.zoom_controller.percentage)
     zoomcalibrator = 1.547 - (0.03 * currentzoom) + (0.0001634 * currentzoom**2)
     return zoomcalibrator
 

mx_bluesky/beamlines/i24/serial/log.py

@@ -108,7 +108,6 @@ def config(
     # Remove dodal StreamHandler to avoid duplication of messages above debug
     dodal_logger.removeHandler(dodal_logger.handlers[0])
     _integrate_bluesky_logs(dodal_logger)
-
     if logfile:
         logs = _get_logging_file_path() / logfile
         fileFormatter = logging.Formatter(

mx_bluesky/beamlines/i24/serial/parameters/constants.py

@@ -25,7 +25,7 @@ BEAM_CENTER_LUT_FILES = {
 
 
 OAV_CONFIG_FILES = {
-    "zoom_params_file": "/dls_sw/i24/software/gda_versions/gda_9_34/config/xml/jCameraManZoomLevels.xml",
+    "zoom_params_file": "/dls_sw/i24/software/gda_versions/gda_9_36/config/xml/jCameraManZoomLevels.xml",
     "oav_config_json": "/dls_sw/i24/software/daq_configuration/json/OAVCentring.json",
     "display_config": "/dls_sw/i24/software/gda_versions/var/display.configuration",
 }

mx_bluesky/beamlines/i24/serial/setup_beamline/setup_beamline.py

@@ -84,7 +84,7 @@ def move_detector_stage_to_position_plan(
     SSX_LOGGER.debug(
         f"Waiting for detector move. Detector distance: {detector_distance} mm."
     )
-    yield from bps.mv(detector_stage.z, detector_distance)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+    yield from bps.mv(detector_stage.z, detector_distance)
 
 
 def set_detector_beam_center_plan(

mx_bluesky/beamlines/i24/serial/setup_beamline/setup_detector.py

@@ -55,7 +55,7 @@ def get_detector_type(detector_stage: DetectorMotion) -> Generator[Msg, None, De
 
 def _move_detector_stage(detector_stage: DetectorMotion, target: float) -> MsgGenerator:
     SSX_LOGGER.info(f"Moving detector stage to target position: {target}.")
-    yield from bps.mv(detector_stage.y, target)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+    yield from bps.mv(detector_stage.y, target)
 
 
 # Workaround in case the PV value has been set to the detector name

mx_bluesky/beamlines/i24/serial/setup_beamline/setup_zebra_plans.py

@@ -55,12 +55,12 @@ def get_zebra_settings_for_extruder(
 
 
 def arm_zebra(zebra: Zebra):
-    yield from bps.abs_set(zebra.pc.arm, ArmDemand.ARM, wait=True)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+    yield from bps.abs_set(zebra.pc.arm, ArmDemand.ARM, wait=True)
     SSX_LOGGER.info("Zebra armed.")
 
 
 def disarm_zebra(zebra: Zebra):
-    yield from bps.abs_set(zebra.pc.arm, ArmDemand.DISARM, wait=True)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+    yield from bps.abs_set(zebra.pc.arm, ArmDemand.DISARM, wait=True)
     SSX_LOGGER.info("Zebra disarmed.")
 
 

mx_bluesky/beamlines/i24/serial/web_gui_plans/general_plans.py

@@ -0,0 +1,109 @@
+# from collections.abc import Sequence
+from typing import Literal
+
+import bluesky.plan_stubs as bps
+import bluesky.preprocessors as bpp
+from blueapi.core import MsgGenerator
+from dodal.beamlines import i24
+
+from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import (
+    ChipType,
+    MappingType,
+    PumpProbeSetting,
+)
+from mx_bluesky.beamlines.i24.serial.fixed_target.i24ssx_moveonclick import (
+    _move_on_mouse_click_plan,
+)
+from mx_bluesky.beamlines.i24.serial.log import _read_visit_directory_from_file
+from mx_bluesky.beamlines.i24.serial.parameters import (
+    FixedTargetParameters,
+    get_chip_format,
+)
+from mx_bluesky.beamlines.i24.serial.setup_beamline import pv
+from mx_bluesky.beamlines.i24.serial.setup_beamline.ca import caput
+from mx_bluesky.beamlines.i24.serial.setup_beamline.pv_abstract import Eiger, Pilatus
+from mx_bluesky.beamlines.i24.serial.setup_beamline.setup_detector import (
+    _move_detector_stage,
+    get_detector_type,
+)
+
+
+@bpp.run_decorator()
+def gui_stage_move_on_click(position_px: tuple[int, int]) -> MsgGenerator:
+    oav = i24.oav()
+    pmac = i24.pmac()
+    yield from _move_on_mouse_click_plan(oav, pmac, position_px)
+
+
+@bpp.run_decorator()
+def gui_gonio_move_on_click(position_px: tuple[int, int]) -> MsgGenerator:
+    oav = i24.oav()
+    gonio = i24.vgonio()
+
+    x_pixels_per_micron = yield from bps.rd(oav.microns_per_pixel_x)
+    y_pixels_per_micron = yield from bps.rd(oav.microns_per_pixel_y)
+
+    x_um = position_px[0] * x_pixels_per_micron
+    y_um = position_px[1] * y_pixels_per_micron
+
+    # gonio is in mm?
+    yield from bps.mv(gonio.x, x_um / 1000, gonio.yh, y_um / 1000)  # type: ignore
+
+
+# See https://github.com/DiamondLightSource/mx-bluesky/issues/853
+@bpp.run_decorator()
+def gui_sleep(sec: int) -> MsgGenerator:
+    for _ in range(sec):
+        yield from bps.sleep(1)
+
+
+@bpp.run_decorator()
+def gui_move_detector(det: Literal["eiger", "pilatus"]) -> MsgGenerator:
+    detector_stage = i24.detector_motion()
+    det_y_target = Eiger.det_y_target if det == "eiger" else Pilatus.det_y_target
+    yield from _move_detector_stage(detector_stage, det_y_target)
+    # Make the output readable
+    caput(pv.me14e_gp101, det)
+
+
+@bpp.run_decorator()
+def gui_set_parameters(
+    sub_dir: str,
+    chip_name: str,
+    exp_time: float,
+    det_dist: float,
+    transmission: float,
+    n_shots: int,
+    chip_type: str,
+    checker_pattern: bool,
+    pump_probe: str,
+    laser_dwell: float,
+    laser_delay: float,
+    pre_pump: float,
+) -> MsgGenerator:
+    # NOTE still a work in progress, adding to it as the ui grows
+    detector_stage = i24.detector_motion()
+    det_type = yield from get_detector_type(detector_stage)
+    chip_params = get_chip_format(ChipType[chip_type])
+
+    params = {
+        "visit": _read_visit_directory_from_file().as_posix(),  # noqa
+        "directory": sub_dir,
+        "filename": chip_name,
+        "exposure_time_s": exp_time,
+        "detector_distance_mm": det_dist,
+        "detector_name": str(det_type),
+        "num_exposures": n_shots,
+        "transmission": transmission,
+        "chip": chip_params,
+        "map_type": MappingType.NoMap,
+        "chip_map": [],
+        "pump_repeat": PumpProbeSetting[pump_probe],  # pump_repeat,
+        "laser_dwell_s": laser_dwell,
+        "laser_delay_s": laser_delay,
+        "checker_pattern": checker_pattern,
+        "pre_pump_exposure_s": pre_pump,
+    }
+    print(FixedTargetParameters(**params))
+    # This will then run the run_fixed_target plan
+    yield from bps.sleep(0.5)

mx_bluesky/beamlines/i24/serial/write_nexus.py

@@ -12,7 +12,7 @@ from mx_bluesky.beamlines.i24.serial.parameters import (
     ExtruderParameters,
     FixedTargetParameters,
 )
-from mx_bluesky.beamlines.i24.serial.setup_beamline import Eiger, caget
+from mx_bluesky.beamlines.i24.serial.setup_beamline import Eiger, caget, cagetstring
 
 
 def call_nexgen(
@@ -53,7 +53,7 @@ def call_nexgen(
             total_numb_imgs = parameters.num_images
             pump_status = parameters.pump_status
 
-    filename_prefix = parameters.filename
+    filename_prefix = cagetstring(Eiger.pv.filenameRBV)
     meta_h5 = parameters.visit / parameters.directory / f"{filename_prefix}_meta.h5"
     t0 = time.time()
     max_wait = 60  # seconds

mx_bluesky/common/external_interaction/callbacks/common/plan_reactive_callback.py

@@ -36,7 +36,7 @@ class PlanReactiveCallback(CallbackBase):
         super().__init__(emit=emit)
         self.emit_cb = emit  # to avoid GC; base class only holds a WeakRef
         self.active = False
-        self.activity_uid = 0
+        self.activity_uid = ""
         self.log = log
 
     def _run_activity_gated(self, name: str, func, doc, override=False):
@@ -76,7 +76,7 @@ class PlanReactiveCallback(CallbackBase):
         do_stop = self.active
         if doc.get("run_start") == self.activity_uid:
             self.active = False
-            self.activity_uid = 0
+            self.activity_uid = ""
         return (
             self._run_activity_gated(
                 "stop", self.activity_gated_stop, doc, override=True

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

@@ -116,7 +116,7 @@ class GridscanISPyBCallback(BaseISPyBCallback):
             scan_data_infos = [
                 ScanDataInfo(
                     data_collection_info=populate_remaining_data_collection_info(
-                        None,
+                        "MX-Bluesky: Xray centring 1 -",
                         None,
                         populate_xy_data_collection_info(
                             self.params.detector_params,
@@ -126,7 +126,7 @@ class GridscanISPyBCallback(BaseISPyBCallback):
                 ),
                 ScanDataInfo(
                     data_collection_info=populate_remaining_data_collection_info(
-                        None,
+                        "MX-Bluesky: Xray centring 2 -",
                         None,
                         populate_xz_data_collection_info(self.params.detector_params),
                         self.params,

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

@@ -43,7 +43,7 @@ def construct_comment_for_gridscan(grid_info: DataCollectionGridInfo) -> str:
         grid_info.microns_per_pixel_y,
     )
     return (
-        "MX-Bluesky: Xray centring - Diffraction grid scan of "
+        "Diffraction grid scan of "
         f"{grid_info.steps_x} by "
         f"{grid_info.steps_y} images in "
         f"{(grid_info.dx_in_mm * 1e3):.1f} um by "

mx_bluesky/common/external_interaction/ispyb/exp_eye_store.py

@@ -2,7 +2,7 @@ import configparser
 from dataclasses import dataclass
 from enum import StrEnum
 
-from requests import patch, post
+from requests import JSONDecodeError, patch, post
 from requests.auth import AuthBase
 
 from mx_bluesky.common.external_interaction.ispyb.ispyb_utils import (
@@ -34,7 +34,11 @@ def _get_base_url_and_token() -> tuple[str, str]:
 def _send_and_get_response(auth, url, data, send_func) -> dict:
     response = send_func(url, auth=auth, json=data)
     if not response.ok:
-        raise ISPyBDepositionNotMade(f"Could not write {data} to {url}: {response}")
+        try:
+            resp_txt = str(response.json())
+        except JSONDecodeError:
+            resp_txt = str(response)
+        raise ISPyBDepositionNotMade(f"Could not write {data} to {url}: {resp_txt}")
     return response.json()
 
 

mx_bluesky/common/external_interaction/ispyb/ispyb_store.py

@@ -206,9 +206,16 @@ class StoreInIspyb:
     def _store_data_collection_table(
         self, conn, data_collection_id, data_collection_info
     ):
+        if data_collection_id and data_collection_info.comments:
+            self.append_to_comment(
+                data_collection_id, data_collection_info.comments, " "
+            )
+            data_collection_info.comments = None
+
         params = self._fill_common_data_collection_params(
             conn, data_collection_id, data_collection_info
         )
+
         return self._upsert_data_collection(conn, params)
 
     def _store_single_scan_data(

mx_bluesky/common/parameters/constants.py

@@ -130,7 +130,7 @@ class PlanGroupCheckpointConstants:
 class DeviceSettingsConstants:
     PANDA_FLYSCAN_SETTINGS_FILENAME = "panda-gridscan"
     PANDA_FLYSCAN_SETTINGS_DIR = os.path.abspath(
-        f"{ROOT_DIR}/hyperion/resources/panda/{PANDA_FLYSCAN_SETTINGS_FILENAME}"
+        f"{ROOT_DIR}/hyperion/resources/panda/"
     )
 
 

mx_bluesky/common/parameters/gridscan.py

@@ -1,9 +1,12 @@
 from __future__ import annotations
 
 from dodal.devices.aperturescatterguard import ApertureValue
+from dodal.devices.detector.det_dim_constants import EIGER2_X_9M_SIZE, EIGER2_X_16M_SIZE
+from dodal.devices.detector.detector import DetectorParams
 from dodal.devices.fast_grid_scan import (
     ZebraGridScanParams,
 )
+from dodal.utils import get_beamline_name
 from pydantic import Field, PrivateAttr
 from scanspec.core import Path as ScanPath
 from scanspec.specs import Line, Static
@@ -18,11 +21,12 @@ from mx_bluesky.common.parameters.components import (
     XyzStarts,
 )
 from mx_bluesky.common.parameters.constants import (
+    DetectorParamConstants,
     GridscanParamConstants,
     HardwareConstants,
 )
 
-"""Parameter models in this file are abstract. They should be inherited by a top-level model"""
+DETECTOR_SIZE_PER_BEAMLINE = {"i02-1": EIGER2_X_9M_SIZE, "dev": EIGER2_X_16M_SIZE}
 
 
 class GridCommon(
@@ -146,3 +150,34 @@ 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=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,
+        )

mx_bluesky/common/plans/do_fgs.py

@@ -14,12 +14,10 @@ from dodal.log import LOGGER
 from dodal.plan_stubs.check_topup import check_topup_and_wait_if_necessary
 from scanspec.core import AxesPoints, Axis
 
-from mx_bluesky.common.device_setup_plans.read_hardware_for_setup import (
-    read_hardware_for_zocalo,
-)
 from mx_bluesky.common.parameters.constants import (
     PlanNameConstants,
 )
+from mx_bluesky.common.plans.read_hardware import read_hardware_for_zocalo
 from mx_bluesky.common.utils.tracing import TRACER
 
 
@@ -30,7 +28,7 @@ def _wait_for_zocalo_to_stage_then_do_fgs(
     during_collection_plan: Callable[[], MsgGenerator] | None = None,
 ):
     expected_images = yield from bps.rd(grid_scan_device.expected_images)
-    exposure_sec_per_image = yield from bps.rd(detector.cam.acquire_time)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+    exposure_sec_per_image = yield from bps.rd(detector.cam.acquire_time)  # type: ignore # Fix types in ophyd-async (https://github.com/DiamondLightSource/mx-bluesky/issues/855)
     LOGGER.info("waiting for topup if necessary...")
     yield from check_topup_and_wait_if_necessary(
         synchrotron,
@@ -101,8 +99,8 @@ def kickoff_and_complete_gridscan(
         }
     )
     @bpp.contingency_decorator(
-        except_plan=lambda e: (yield from bps.stop(detector)),  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
-        else_plan=lambda: (yield from bps.unstage(detector)),  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+        except_plan=lambda e: (yield from bps.stop(detector)),  # type: ignore # Fix types in ophyd-async (https://github.com/DiamondLightSource/mx-bluesky/issues/855)
+        else_plan=lambda: (yield from bps.unstage(detector)),
     )
     def _decorated_do_fgs():
         yield from _wait_for_zocalo_to_stage_then_do_fgs(