mx-bluesky 1.5.2__py3-none-any.whl → 1.5.4__py3-none-any.whl

mx_bluesky/_version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '1.5.2'
-__version_tuple__ = version_tuple = (1, 5, 2)
+__version__ = version = '1.5.4'
+__version_tuple__ = version_tuple = (1, 5, 4)
+
+__commit_id__ = commit_id = None

mx_bluesky/beamlines/aithre_lasershaping/__init__.py

@@ -1,4 +1,5 @@
 from mx_bluesky.beamlines.aithre_lasershaping.beamline_safe import (
+    go_to_zero,
     set_beamline_safe_on_robot,
 )
 from mx_bluesky.beamlines.aithre_lasershaping.check_goniometer_performance import (
@@ -18,4 +19,5 @@ __all__ = [
     "go_to_furthest_maximum",
     "rotate_goniometer_relative",
     "jog_sample",
+    "go_to_zero",
 ]

mx_bluesky/beamlines/aithre_lasershaping/beamline_safe.py

@@ -34,3 +34,20 @@ def set_beamline_safe_on_robot(
         else ForceBit.NO.value
     )
     yield from bps.abs_set(robot.set_beamline_safe, set_value, wait=True)
+
+
+def go_to_zero(
+    goniometer: Goniometer = inject("goniometer"), group="move_to_zero", wait=True
+) -> MsgGenerator:
+    """
+    Rotate the goniometer and set stages to zero in preparation for robot load/unload.
+    Pass wait=False to avoid waiting for the move to complete.
+    """
+    yield from bps.abs_set(goniometer.omega, 0, group=group)
+    yield from bps.abs_set(goniometer.x, 0, group=group)
+    yield from bps.abs_set(goniometer.y, 0, group=group)
+    yield from bps.abs_set(goniometer.z, 0, group=group)
+    yield from bps.abs_set(goniometer.sampy, 0, group=group)
+    yield from bps.abs_set(goniometer.sampz, 0, group=group)
+    if wait:
+        yield from bps.wait(group=group)

mx_bluesky/beamlines/i04/__init__.py

@@ -1,6 +1,10 @@
-from mx_bluesky.beamlines.i04.experiment_plans import (
-    i04_grid_detect_then_xray_centre_plan,
+from mx_bluesky.beamlines.i04.experiment_plans.i04_grid_detect_then_xray_centre_plan import (
+    i04_grid_detect_then_xray_centre,
 )
 from mx_bluesky.beamlines.i04.thawing_plan import thaw, thaw_and_stream_to_redis
 
-__all__ = ["thaw", "thaw_and_stream_to_redis", "i04_grid_detect_then_xray_centre_plan"]
+__all__ = [
+    "thaw",
+    "thaw_and_stream_to_redis",
+    "i04_grid_detect_then_xray_centre",
+]

mx_bluesky/beamlines/i04/experiment_plans/i04_grid_detect_then_xray_centre_plan.py

@@ -4,7 +4,6 @@ from functools import partial
 
 import bluesky.plan_stubs as bps
 import bluesky.preprocessors as bpp
-from blueapi.core import BlueskyContext
 from bluesky.utils import MsgGenerator
 from dodal.common import inject
 from dodal.devices.aperturescatterguard import ApertureScatterguard
@@ -66,19 +65,13 @@ from mx_bluesky.common.parameters.gridscan import GridCommon, SpecifiedThreeDGri
 from mx_bluesky.common.preprocessors.preprocessors import (
     transmission_and_xbpm_feedback_for_collection_decorator,
 )
-from mx_bluesky.common.utils.context import device_composite_from_context
+from mx_bluesky.common.utils.log import LOGGER
 from mx_bluesky.phase1_zebra.device_setup_plans.setup_zebra import (
     setup_zebra_for_gridscan,
     tidy_up_zebra_after_gridscan,
 )
 
 
-def create_devices(
-    context: BlueskyContext,
-) -> GridDetectThenXRayCentreComposite:
-    return device_composite_from_context(context, GridDetectThenXRayCentreComposite)
-
-
 # See https://github.com/DiamondLightSource/blueapi/issues/506 for using device composites
 def i04_grid_detect_then_xray_centre(
     parameters: GridCommon,
@@ -184,9 +177,11 @@ def get_ready_for_oav_and_close_shutter(
 ):
     yield from bps.wait(PlanGroupCheckpointConstants.GRID_READY_FOR_DC)
     group = "get_ready_for_oav_and_close_shutter"
+    LOGGER.info("Non-udc tidy: Seting up beamline for OAV")
     yield from setup_beamline_for_OAV(
         smargon, backlight, aperture_scatterguard, group=group
     )
+    LOGGER.info("Non-udc tidy: Closing detector shutter")
     yield from bps.abs_set(
         detector_motion.shutter,
         0,

mx_bluesky/beamlines/i04/thawing_plan.py

@@ -10,7 +10,7 @@ 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 Thawer, ThawerStates
+from dodal.devices.thawer import OnOff, Thawer
 
 from mx_bluesky.beamlines.i04.callbacks.murko_callback import MurkoCallback
 
@@ -117,7 +117,7 @@ def _thaw(
 
     def do_thaw():
         yield from bps.abs_set(smargon.omega.velocity, new_velocity, wait=True)
-        yield from bps.abs_set(thawer.control, ThawerStates.ON, 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()
@@ -125,7 +125,7 @@ def _thaw(
 
     def cleanup():
         yield from bps.abs_set(smargon.omega.velocity, inital_velocity, wait=True)
-        yield from bps.abs_set(thawer.control, ThawerStates.OFF, wait=True)
+        yield from bps.abs_set(thawer.control, OnOff.OFF, wait=True)
 
     # Always cleanup even if there is a failure
     yield from bpp.contingency_wrapper(

mx_bluesky/beamlines/i24/serial/blueapi_config.yaml

@@ -7,11 +7,11 @@ env:
   events:
     broadcast_status_events: false
 api:
-  port: 25565
+  url: http://localhost:25565
   cors:
     allow_credentials: True
     origins: 
       - "*"
 stomp:
   enabled: true
-  host: i24-control.diamond.ac.uk
+  url: http://i24-control.diamond.ac.uk:61613

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

@@ -89,7 +89,7 @@ x 143
 y 82
 w 110
 h 30
-controlPv "ME14E-MO-IOC-01:GP6"
+controlPv "BL24I-MO-IOC-01: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 "ME14E-MO-IOC-01:GP7"
+controlPv "BL24I-MO-IOC-01: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 "ME14E-MO-IOC-01:GP8"
+controlPv "BL24I-MO-IOC-01: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 "ME14E-MO-IOC-01:GP1"
+visPv "BL24I-MO-IOC-01:GP1"
 visMin "0"
 visMax "2"
 endObjectProperties
@@ -598,7 +598,7 @@ h 143
 lineColor index 7
 fill
 fillColor index 7
-visPv "ME14E-MO-IOC-01:GP1"
+visPv "BL24I-MO-IOC-01:GP1"
 visMin "0"
 visMax "2"
 endObjectProperties
@@ -618,7 +618,7 @@ fontAlign "center"
 fgColor index 14
 bgColor index 0
 useDisplayBg
-visPv "ME14E-MO-IOC-01:GP1"
+visPv "BL24I-MO-IOC-01:GP1"
 visMin "0"
 visMax "2"
 value {
@@ -648,7 +648,7 @@ botShadowColor index 11
 font "arial-medium-r-18.0"
 numCmds 1
 command {
-  0 "caput ME14E-MO-CHIP-01:PMAC_STRING \\#1hmz\\#2hmz\\#3hmz"
+  0 "caput BL24I-EA-CHIP-01:PMAC_STRING \\#5hmz\\#6hmz\\#7hmz"
 }
 endObjectProperties
 
@@ -728,7 +728,7 @@ h 143
 lineColor index 7
 fill
 fillColor index 7
-visPv "ME14E-MO-IOC-01:GP1"
+visPv "BL24I-MO-IOC-01:GP1"
 visMin "0"
 visMax "2"
 endObjectProperties
@@ -748,7 +748,7 @@ fontAlign "center"
 fgColor index 14
 bgColor index 0
 useDisplayBg
-visPv "ME14E-MO-IOC-01:GP1"
+visPv "BL24I-MO-IOC-01:GP1"
 visMin "0"
 visMax "2"
 value {
@@ -792,7 +792,7 @@ x 146
 y 209
 w 110
 h 25
-controlPv "ME14E-MO-IOC-01:GP99"
+controlPv "BL24I-MO-IOC-01:GP99"
 font "arial-medium-r-18.0"
 fontAlign "right"
 fgColor index 25

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

@@ -78,7 +78,7 @@ fgColour index 14
 bgColour index 4
 topShadowColour index 1
 botShadowColour index 8
-controlPv "ME14E-MO-IOC-01:GP101"
+controlPv "BL24I-MO-IOC-01:GP101"
 font "arial-medium-r-18.0"
 numItems 2
 symbolTag {