mx-bluesky 1.5.11__py3-none-any.whl → 1.5.14__py3-none-any.whl

mx_bluesky/beamlines/i04/thawing_plan.py

@@ -1,18 +1,15 @@
-from collections.abc import Callable
-from functools import partial
-
 import bluesky.plan_stubs as bps
 import bluesky.preprocessors as bpp
-from bluesky.preprocessors import run_decorator, subs_decorator
+from bluesky.preprocessors import contingency_decorator, run_decorator, subs_decorator
 from bluesky.utils import MsgGenerator
 from dodal.common import inject
 from dodal.devices.i04.constants import RedisConstants
 from dodal.devices.i04.murko_results import MurkoResultsDevice
-from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.oav.oav_to_redis_forwarder import OAVToRedisForwarder, Source
 from dodal.devices.robot import BartRobot
 from dodal.devices.smargon import Smargon
 from dodal.devices.thawer import OnOff, Thawer
+from dodal.log import LOGGER
 
 from mx_bluesky.beamlines.i04.callbacks.murko_callback import MurkoCallback
 
@@ -29,53 +26,26 @@ def thaw(
 
     Args:
         time_to_thaw (float): Time to thaw for, in seconds.
-        rotation (float, optional): How much to rotate by whilst thawing, in degrees.
-                                    Defaults to 360.
-        ... devices: These are the specific ophyd-devices used for the plan, the
-                     defaults are always correct.
+        rotation (float): How much to rotate by whilst thawing, in degrees.
+        thawer (Thawer): The thawing device.
+        smargon (Smargon): The smargon used to rotate.
     """
-    yield from _thaw(time_to_thaw, rotation, thawer, smargon)
-
-
-def thaw_and_stream_to_redis(
-    time_to_thaw: float,
-    rotation: float = 360,
-    robot: BartRobot = inject("robot"),
-    thawer: Thawer = inject("thawer"),
-    smargon: Smargon = inject("smargon"),
-    oav: OAV = inject("oav_full_screen"),
-    oav_to_redis_forwarder: OAVToRedisForwarder = inject("oav_to_redis_forwarder"),
-) -> MsgGenerator:
-    """Turns on the thawer and rotates the sample by {rotation} degrees to thaw it, then
-    rotates {rotation} degrees back and turns the thawer off. The speed of the goniometer
-    is set such that the process takes whole process will take {time_to_thaw} time.
+    initial_velocity = yield from bps.rd(smargon.omega.velocity)
+    new_velocity = abs(rotation / time_to_thaw) * 2.0
 
-    At the same time streams OAV images to redis for later processing (e.g. by murko).
-    On the first rotation the images from the large ROI are streamed, on the second the
-    smaller ROI is used.
+    def do_thaw():
+        yield from bps.abs_set(smargon.omega.velocity, new_velocity, wait=True)
+        yield from bps.abs_set(thawer, OnOff.ON, wait=True)
+        yield from bps.rel_set(smargon.omega, rotation, wait=True)
+        yield from bps.rel_set(smargon.omega, -rotation, wait=True)
 
-    Args:
-        time_to_thaw (float): Time to thaw for, in seconds.
-        rotation (float, optional): How much to rotate by whilst thawing, in degrees.
-                                    Defaults to 360.
-        ... devices: These are the specific ophyd-devices used for the plan, the
-                     defaults are always correct
-    """
+    def cleanup():
+        yield from bps.abs_set(smargon.omega.velocity, initial_velocity, wait=True)
+        yield from bps.abs_set(thawer, OnOff.OFF, wait=True)
 
-    def switch_forwarder_to_roi() -> MsgGenerator:
-        yield from bps.complete(oav_to_redis_forwarder, wait=True)
-        yield from bps.mv(oav_to_redis_forwarder.selected_source, Source.ROI.value)
-        yield from bps.kickoff(oav_to_redis_forwarder, wait=True)
-
-    yield from _thaw_and_stream_to_redis(
-        time_to_thaw,
-        rotation,
-        robot,
-        thawer,
-        smargon,
-        oav,
-        oav_to_redis_forwarder,
-        switch_forwarder_to_roi,
+    yield from bpp.contingency_wrapper(
+        do_thaw(),
+        final_plan=cleanup,
     )
 
 
@@ -85,14 +55,13 @@ def thaw_and_murko_centre(
     robot: BartRobot = inject("robot"),
     thawer: Thawer = inject("thawer"),
     smargon: Smargon = inject("smargon"),
-    oav: OAV = inject("oav_full_screen"),
     murko_results: MurkoResultsDevice = inject("murko_results"),
     oav_to_redis_forwarder: OAVToRedisForwarder = inject("oav_to_redis_forwarder"),
 ) -> MsgGenerator:
     """Thaws the sample and centres it using murko by:
         1. Turns on the thawer
         2. Rotates the sample by {rotation} degrees, whilst this is happening images from
-        the large ROI of the OAV are being fed to murko
+        the full screen OAV are being fed to murko
         3. After the rotation has completed moves to the average centre returned by murko
         from these images
         4. Rotate {rotation} degrees back to the start, whilst this is happening images
@@ -109,147 +78,173 @@ def thaw_and_murko_centre(
         ... devices: These are the specific ophyd-devices used for the plan, the
                      defaults are always correct
     """
-
     murko_results_group = "get_results"
 
-    def centre_then_switch_forwarder_to_roi() -> MsgGenerator:
-        yield from bps.complete(oav_to_redis_forwarder, wait=True)
+    sample_id = yield from bps.rd(robot.sample_id)
+    sample_id = int(sample_id)
 
-        yield from bps.mv(oav_to_redis_forwarder.selected_source, Source.ROI.value)
+    oav_fs = oav_to_redis_forwarder.sources[Source.FULL_SCREEN].oav_ref()
 
+    initial_zoom_level = yield from bps.rd(oav_fs.zoom_controller.level)
+    initial_velocity = yield from bps.rd(smargon.omega.velocity)
+    new_velocity = abs(rotation / time_to_thaw) * 2.0
+    murko_callback = MurkoCallback(
+        RedisConstants.REDIS_HOST,
+        RedisConstants.REDIS_PASSWORD,
+        RedisConstants.MURKO_REDIS_DB,
+    )
+
+    def cleanup():
+        yield from bps.mv(oav_fs.zoom_controller.level, initial_zoom_level)
+        yield from bps.abs_set(smargon.omega.velocity, initial_velocity, wait=True)
+        yield from bps.abs_set(thawer, OnOff.OFF, wait=True)
+
+    def centre_from_murko():
         yield from bps.wait(murko_results_group)
+
         x_predict = yield from bps.rd(murko_results.x_mm)
         y_predict = yield from bps.rd(murko_results.y_mm)
         z_predict = yield from bps.rd(murko_results.z_mm)
 
+        LOGGER.info(f"Got results: {x_predict, y_predict, z_predict}")
+
         yield from bps.rel_set(smargon.x, x_predict)
         yield from bps.rel_set(smargon.y, y_predict)
         yield from bps.rel_set(smargon.z, z_predict)
 
-        yield from bps.kickoff(oav_to_redis_forwarder, wait=True)
+    @subs_decorator(murko_callback)
+    @contingency_decorator(final_plan=cleanup)
+    def do_thaw_and_murko_centre():
+        yield from bps.mv(
+            murko_results.sample_id,
+            str(sample_id),
+            oav_to_redis_forwarder.sample_id,
+            sample_id,
+            oav_fs.zoom_controller.level,
+            "1.0x",
+        )
+        yield from bps.abs_set(smargon.omega.velocity, new_velocity, wait=True)
+        yield from bps.abs_set(thawer, OnOff.ON, wait=True)
 
-    sample_id = yield from bps.rd(robot.sample_id)
-    yield from bps.mv(murko_results.sample_id, str(sample_id))
+        def rotate_in_one_direction_then_murko_centre(
+            rotation: float, oav_mode: Source
+        ):
+            @run_decorator(md={"sample_id": sample_id})
+            def rotate_in_one_direction_and_start_murko_and_stream_to_redis():
+                yield from bps.stage(murko_results, wait=True)
+                yield from bps.trigger(murko_results, group=murko_results_group)
 
-    yield from bps.stage(murko_results, wait=True)
-    yield from bps.trigger(murko_results, group=murko_results_group)
+                yield from _rotate_in_one_direction_and_stream_to_redis(
+                    smargon, oav_to_redis_forwarder, oav_mode, rotation
+                )
 
-    yield from bpp.contingency_wrapper(
-        _thaw_and_stream_to_redis(
-            time_to_thaw,
-            rotation,
-            robot,
-            thawer,
-            smargon,
-            oav,
-            oav_to_redis_forwarder,
-            centre_then_switch_forwarder_to_roi,
-        ),
-        final_plan=partial(bps.unstage, murko_results, wait=True),
-    )
+            yield from rotate_in_one_direction_and_start_murko_and_stream_to_redis()
+
+            yield from centre_from_murko()
+            yield from bps.unstage(murko_results, wait=True)
 
+        yield from rotate_in_one_direction_then_murko_centre(
+            rotation, Source.FULL_SCREEN
+        )
+        yield from rotate_in_one_direction_then_murko_centre(-rotation, Source.ROI)
+
+    yield from do_thaw_and_murko_centre()
 
-def _thaw(
+
+def thaw_and_stream_to_redis(
     time_to_thaw: float,
-    rotation: float,
-    thawer: Thawer,
-    smargon: Smargon,
-    plan_between_rotations: Callable[[], MsgGenerator] | None = None,
+    rotation: float = 360,
+    robot: BartRobot = inject("robot"),
+    thawer: Thawer = inject("thawer"),
+    smargon: Smargon = inject("smargon"),
+    oav_to_redis_forwarder: OAVToRedisForwarder = inject("oav_to_redis_forwarder"),
 ) -> MsgGenerator:
     """Turns on the thawer and rotates the sample by {rotation} degrees to thaw it, then
     rotates {rotation} degrees back and turns the thawer off. The speed of the goniometer
     is set such that the process takes whole process will take {time_to_thaw} time.
 
+    At the same time streams OAV images to redis for later processing (e.g. by murko).
+    On the first rotation the images from the large ROI are streamed, on the second the
+    smaller ROI is used.
+
     Args:
         time_to_thaw (float): Time to thaw for, in seconds.
-        rotation (float): How much to rotate by whilst thawing, in degrees.
-        thawer (Thawer): The thawing device.
-        smargon (Smargon): The smargon used to rotate.
-        plan_between_rotations (MsgGenerator, optional): A plan to run between rotations
-                                    of the smargon. Defaults to no plan.
+        rotation (float, optional): How much to rotate by whilst thawing, in degrees.
+                                    Defaults to 360.
+        ... devices: These are the specific ophyd-devices used for the plan, the
+                     defaults are always correct
     """
+    sample_id = yield from bps.rd(robot.sample_id)
+    sample_id = int(sample_id)
+
+    oav_fs = oav_to_redis_forwarder.sources[Source.FULL_SCREEN].oav_ref()
+
+    initial_zoom_level = yield from bps.rd(oav_fs.zoom_controller.level)
     initial_velocity = yield from bps.rd(smargon.omega.velocity)
     new_velocity = abs(rotation / time_to_thaw) * 2.0
 
-    def do_thaw():
-        yield from bps.abs_set(smargon.omega.velocity, new_velocity, wait=True)
-        yield from bps.abs_set(thawer.control, OnOff.ON, wait=True)
-        yield from bps.rel_set(smargon.omega, rotation, wait=True)
-        if plan_between_rotations:
-            yield from plan_between_rotations()
-        yield from bps.rel_set(smargon.omega, -rotation, wait=True)
+    murko_callback = MurkoCallback(
+        RedisConstants.REDIS_HOST,
+        RedisConstants.REDIS_PASSWORD,
+        RedisConstants.MURKO_REDIS_DB,
+    )
 
     def cleanup():
+        yield from bps.mv(oav_fs.zoom_controller.level, initial_zoom_level)
         yield from bps.abs_set(smargon.omega.velocity, initial_velocity, wait=True)
-        yield from bps.abs_set(thawer.control, OnOff.OFF, wait=True)
+        yield from bps.abs_set(thawer, OnOff.OFF, wait=True)
 
-    # Always cleanup even if there is a failure
-    yield from bpp.contingency_wrapper(
-        do_thaw(),
-        final_plan=cleanup,
-    )
-
-
-def _thaw_and_stream_to_redis(
-    time_to_thaw: float,
-    rotation: float,
-    robot: BartRobot,
-    thawer: Thawer,
-    smargon: Smargon,
-    oav: OAV,
-    oav_to_redis_forwarder: OAVToRedisForwarder,
-    plan_between_rotations: Callable[[], MsgGenerator],
-) -> MsgGenerator:
-    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)
-
-    yield from bps.mv(oav.zoom_controller.level, "1.0x")
-
-    microns_per_pixel_x = yield from bps.rd(oav.microns_per_pixel_x)
-    microns_per_pixel_y = yield from bps.rd(oav.microns_per_pixel_y)
-    beam_centre_i = yield from bps.rd(oav.beam_centre_i)
-    beam_centre_j = yield from bps.rd(oav.beam_centre_j)
-
-    @subs_decorator(
-        MurkoCallback(
-            RedisConstants.REDIS_HOST,
-            RedisConstants.REDIS_PASSWORD,
-            RedisConstants.MURKO_REDIS_DB,
-        )
-    )
-    @run_decorator(
-        md={
-            "microns_per_x_pixel": microns_per_pixel_x,
-            "microns_per_y_pixel": microns_per_pixel_y,
-            "beam_centre_i": beam_centre_i,
-            "beam_centre_j": beam_centre_j,
-            "zoom_percentage": zoom_percentage,
-            "sample_id": sample_id,
-        }
-    )
-    def _main_plan():
+    @subs_decorator(murko_callback)
+    @contingency_decorator(final_plan=cleanup)
+    def do_thaw_and_stream_to_redis():
         yield from bps.mv(
             oav_to_redis_forwarder.sample_id,
             sample_id,
-            oav_to_redis_forwarder.selected_source,
-            Source.FULL_SCREEN.value,
+            oav_fs.zoom_controller.level,
+            "1.0x",
         )
-
-        yield from bps.kickoff(oav_to_redis_forwarder, wait=True)
-        yield from bps.monitor(smargon.omega.user_readback, name="smargon")
-        yield from bps.monitor(oav_to_redis_forwarder.uuid, name="oav")
-        yield from _thaw(
-            time_to_thaw, rotation, thawer, smargon, plan_between_rotations
+        yield from bps.abs_set(smargon.omega.velocity, new_velocity, wait=True)
+        yield from bps.abs_set(thawer, OnOff.ON, wait=True)
+
+        @run_decorator(md={"sample_id": sample_id})
+        def rotate_in_one_direction_and_stream_to_redis(
+            rotation: float, oav_mode: Source
+        ):
+            yield from _rotate_in_one_direction_and_stream_to_redis(
+                smargon, oav_to_redis_forwarder, oav_mode, rotation
+            )
+
+        yield from rotate_in_one_direction_and_stream_to_redis(
+            rotation, Source.FULL_SCREEN
         )
-        yield from bps.complete(oav_to_redis_forwarder)
+        yield from rotate_in_one_direction_and_stream_to_redis(-rotation, Source.ROI)
 
-    def cleanup():
-        yield from bps.mv(oav.zoom_controller.level, zoom_level_before_thawing)
+    yield from do_thaw_and_stream_to_redis()
 
-    yield from bpp.contingency_wrapper(
-        _main_plan(),
-        final_plan=cleanup,
+
+def _rotate_in_one_direction_and_stream_to_redis(
+    smargon: Smargon,
+    oav_to_redis_forwarder: OAVToRedisForwarder,
+    oav_mode: Source,
+    rotation: float,
+):
+    def get_metadata_from_current_oav():
+        current_source_idx = yield from bps.rd(oav_to_redis_forwarder.selected_source)
+        oav = oav_to_redis_forwarder.sources[current_source_idx].oav_ref()
+        yield from bps.create()
+        oav_info = yield from bps.read(oav)
+        LOGGER.info(f"Got oav information: {oav_info}")
+        yield from bps.save()
+
+    yield from bps.mv(
+        oav_to_redis_forwarder.selected_source,
+        oav_mode.value,
     )
+
+    yield from get_metadata_from_current_oav()
+    yield from bps.monitor(smargon.omega.user_readback, name="smargon")
+    yield from bps.monitor(oav_to_redis_forwarder.uuid, name="oav")
+
+    yield from bps.kickoff(oav_to_redis_forwarder, wait=True)
+    yield from bps.rel_set(smargon.omega, rotation, wait=True)
+    yield from bps.complete(oav_to_redis_forwarder, wait=True)

mx_bluesky/beamlines/i24/serial/dcid.py

@@ -112,6 +112,8 @@ class DCID:
         match expt_params.detector_name:
             case "eiger":
                 self.detector = Eiger()
+            case _:
+                raise ValueError("Unknown detector:", expt_params.detector_name)
 
         self.server = server or DEFAULT_ISPYB_SERVER
         self.emit_errors = emit_errors
@@ -144,7 +146,7 @@ class DCID:
         try:
             if not start_time:
                 start_time = datetime.datetime.now().astimezone()
-            elif not start_time.timetz:
+            else:
                 start_time = start_time.astimezone()
 
             resolution = get_resolution(
@@ -156,10 +158,7 @@ class DCID:
             transmission = self.parameters.transmission * 100
             xbeam, ybeam = beam_settings.beam_center_in_mm
 
-            if isinstance(self.detector, Eiger):
-                start_image_number = 1
-            else:
-                raise ValueError("Unknown detector:", self.detector)
+            start_image_number = 1
 
             events = [
                 {

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

@@ -253,6 +253,7 @@ def main_extruder_plan(
                     parameters.exposure_time_s,
                 ],
                 dcm,
+                detector_stage,
             )
             yield from setup_zebra_for_extruder_with_pump_probe_plan(
                 zebra,
@@ -275,6 +276,7 @@ def main_extruder_plan(
                     parameters.exposure_time_s,
                 ],
                 dcm,
+                detector_stage,
             )
             yield from setup_zebra_for_quickshot_plan(
                 zebra, parameters.exposure_time_s, parameters.num_images, wait=True
@@ -374,6 +376,7 @@ def tidy_up_at_collection_end_plan(
     parameters: ExtruderParameters,
     dcid: DCID,
     dcm: DCM,
+    detector_stage: YZStage,
 ) -> MsgGenerator:
     """A plan to tidy up at the end of a collection, successful or aborted.
 
@@ -386,7 +389,7 @@ def tidy_up_at_collection_end_plan(
 
     # Clean Up
     if parameters.detector_name == "eiger":
-        yield from sup.eiger("return-to-normal", None, dcm)
+        yield from sup.eiger("return-to-normal", None, dcm, detector_stage)
         SSX_LOGGER.debug(f"{parameters.filename}_{caget(pv.eiger_seq_id)}")
     SSX_LOGGER.debug("End of Run")
     SSX_LOGGER.info("Close hutch shutter")
@@ -452,7 +455,7 @@ def run_plan_in_wrapper(
         ),
         final_plan=lambda: (
             yield from tidy_up_at_collection_end_plan(
-                zebra, shutter, parameters, dcid, dcm
+                zebra, shutter, parameters, dcid, dcm, detector_stage
             )
         ),
         auto_raise=False,

mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/CustomChip_py3v1.edl

@@ -4,7 +4,7 @@ major 4
 minor 0
 release 1
 x 1203
-y 544
+y 581
 w 550
 h 380
 font "arial-medium-r-18.0"
@@ -89,7 +89,7 @@ x 143
 y 82
 w 110
 h 30
-controlPv "BL24I-MO-IOC-01:GP6"
+controlPv "BL24I-MO-IOC-13:GP6"
 font "arial-medium-r-18.0"
 fontAlign "right"
 fgColor index 25
@@ -180,7 +180,7 @@ x 144
 y 126
 w 110
 h 30
-controlPv "BL24I-MO-IOC-01:GP7"
+controlPv "BL24I-MO-IOC-13:GP7"
 font "arial-medium-r-18.0"
 fontAlign "right"
 fgColor index 25
@@ -464,7 +464,7 @@ x 145
 y 171
 w 110
 h 30
-controlPv "BL24I-MO-IOC-01:GP8"
+controlPv "BL24I-MO-IOC-13:GP8"
 font "arial-medium-r-18.0"
 fontAlign "right"
 fgColor index 25
@@ -580,7 +580,7 @@ h 144
 lineColor index 7
 fill
 fillColor index 7
-visPv "BL24I-MO-IOC-01:GP1"
+visPv "BL24I-MO-IOC-13:GP1"
 visMin "0"
 visMax "2"
 endObjectProperties
@@ -598,7 +598,7 @@ h 143
 lineColor index 7
 fill
 fillColor index 7
-visPv "BL24I-MO-IOC-01:GP1"
+visPv "BL24I-MO-IOC-13:GP1"
 visMin "0"
 visMax "2"
 endObjectProperties
@@ -618,7 +618,7 @@ fontAlign "center"
 fgColor index 14
 bgColor index 0
 useDisplayBg
-visPv "BL24I-MO-IOC-01:GP1"
+visPv "BL24I-MO-IOC-13:GP1"
 visMin "0"
 visMax "2"
 value {
@@ -648,7 +648,7 @@ botShadowColor index 11
 font "arial-medium-r-18.0"
 numCmds 1
 command {
-  0 "caput BL24I-EA-CHIP-01:PMAC_STRING \\#5hmz\\#6hmz\\#7hmz"
+  0 "caput BL24I-MO-IOC-13:PMAC:console \\#5hmz\\#6hmz\\#7hmz"
 }
 endObjectProperties
 
@@ -728,7 +728,7 @@ h 143
 lineColor index 7
 fill
 fillColor index 7
-visPv "BL24I-MO-IOC-01:GP1"
+visPv "BL24I-MO-IOC-13:GP1"
 visMin "0"
 visMax "2"
 endObjectProperties
@@ -748,7 +748,7 @@ fontAlign "center"
 fgColor index 14
 bgColor index 0
 useDisplayBg
-visPv "BL24I-MO-IOC-01:GP1"
+visPv "BL24I-MO-IOC-13:GP1"
 visMin "0"
 visMax "2"
 value {
@@ -792,7 +792,7 @@ x 146
 y 209
 w 110
 h 25
-controlPv "BL24I-MO-IOC-01:GP99"
+controlPv "BL24I-MO-IOC-13:GP99"
 font "arial-medium-r-18.0"
 fontAlign "right"
 fgColor index 25

mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/DetStage.edl

@@ -4,7 +4,7 @@ major 4
 minor 0
 release 1
 x 1205
-y 616
+y 653
 w 450
 h 180
 font "arial-medium-r-18.0"
@@ -78,9 +78,9 @@ fgColour index 14
 bgColour index 4
 topShadowColour index 1
 botShadowColour index 8
-controlPv "BL24I-MO-IOC-01:GP101"
+controlPv "BL24I-MO-IOC-13:GP101"
 font "arial-medium-r-18.0"
-numItems 2
+numItems 1
 symbolTag {
   0 "Eiger"
 }