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

mx_bluesky/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.4.7'
-__version_tuple__ = version_tuple = (1, 4, 7)
+__version__ = version = '1.4.9'
+__version_tuple__ = version_tuple = (1, 4, 9)

mx_bluesky/beamlines/aithre_lasershaping/__init__.py

@@ -1,13 +1,21 @@
+from mx_bluesky.beamlines.aithre_lasershaping.beamline_safe import (
+    set_beamline_safe_on_robot,
+)
 from mx_bluesky.beamlines.aithre_lasershaping.check_goniometer_performance import (
     check_omega_performance,
 )
 from mx_bluesky.beamlines.aithre_lasershaping.goniometer_controls import (
     change_goniometer_turn_speed,
+    go_to_furthest_maximum,
+    jog_sample,
     rotate_goniometer_relative,
 )
 
 __all__ = [
+    "set_beamline_safe_on_robot",
     "check_omega_performance",
     "change_goniometer_turn_speed",
+    "go_to_furthest_maximum",
     "rotate_goniometer_relative",
+    "jog_sample",
 ]

mx_bluesky/beamlines/aithre_lasershaping/beamline_safe.py

@@ -0,0 +1,36 @@
+import bluesky.plan_stubs as bps
+from bluesky.utils import MsgGenerator
+from dodal.common import inject
+from dodal.devices.aithre_lasershaping.goniometer import Goniometer
+from dodal.devices.aithre_lasershaping.laser_robot import ForceBit, LaserRobot
+
+
+def set_beamline_safe_on_robot(
+    robot: LaserRobot = inject("robot"), goniometer: Goniometer = inject("goniometer")
+) -> MsgGenerator:
+    """
+    The beamline safe PV is used in the Aithre laser shaping system to indicate whether
+    the goniometer is in the correct position for the robot to load a sample. The robot
+    is trained to load at the goniometer zero position, so if the translation and
+    rotation axes of the goniometer are at zero, then the beamline safe PV bit is forced
+    on.
+    """
+    pvs = [
+        goniometer.x,
+        goniometer.y,
+        goniometer.z,
+        goniometer.sampy,
+        goniometer.sampz,
+        goniometer.omega,
+    ]
+
+    values: list[float] = []
+    for pv in pvs:
+        values.append((yield from bps.rd(pv)))
+
+    set_value = (
+        ForceBit.ON.value
+        if all(round(value, 3) == 0 for value in values)
+        else ForceBit.NO.value
+    )
+    yield from bps.abs_set(robot.set_beamline_safe, set_value, wait=True)

mx_bluesky/beamlines/aithre_lasershaping/goniometer_controls.py

@@ -1,9 +1,20 @@
+from enum import StrEnum
+
 import bluesky.plan_stubs as bps
 from bluesky.utils import MsgGenerator
 from dodal.common import inject
 from dodal.devices.aithre_lasershaping.goniometer import Goniometer
 
 
+class JogDirection(StrEnum):
+    UP = "up"
+    DOWN = "down"
+    LEFT = "left"
+    RIGHT = "right"
+    ZPLUS = "z_plus"
+    ZMINUS = "z_minus"
+
+
 def rotate_goniometer_relative(
     value: float, goniometer: Goniometer = inject("goniometer")
 ) -> MsgGenerator:
@@ -16,3 +27,35 @@ def change_goniometer_turn_speed(
 ) -> MsgGenerator:
     """Set the velocity of the goniometer"""
     yield from bps.mv(goniometer.omega.velocity, velocity)
+
+
+def jog_sample(
+    direction: JogDirection,
+    increment_size: float,
+    goniometer: Goniometer = inject("goniometer"),
+) -> MsgGenerator:
+    """Adjust the goniometer stage positions"""
+    direction_map = {
+        JogDirection.RIGHT: (goniometer.x, 1),
+        JogDirection.LEFT: (goniometer.x, -1),
+        JogDirection.ZPLUS: (goniometer.z, 1),
+        JogDirection.ZMINUS: (goniometer.z, -1),
+        JogDirection.UP: (goniometer.vertical_position, 1),
+        JogDirection.DOWN: (goniometer.vertical_position, -1),
+    }
+
+    axis, sign = direction_map[direction]
+    yield from bps.mvr(axis, sign * increment_size)
+
+
+def go_to_furthest_maximum(
+    goniometer: Goniometer = inject("goniometer"),
+) -> MsgGenerator:
+    """Rotate to positive or negative maximum, whichever is further away"""
+
+    LIMIT_OF_TRAVEL = 3600
+    current_value: float = yield from bps.rd(goniometer.omega.user_readback)
+
+    yield from bps.mv(
+        goniometer.omega, -LIMIT_OF_TRAVEL if current_value > 0 else LIMIT_OF_TRAVEL
+    )

mx_bluesky/beamlines/i04/redis_to_murko_forwarder.py

@@ -6,7 +6,7 @@ from typing import TypedDict
 
 import numpy as np
 import zmq
-from dodal.beamlines.i04 import MURKO_REDIS_DB, REDIS_HOST, REDIS_PASSWORD
+from dodal.devices.i04.constants import RedisConstants
 from numpy.typing import NDArray
 from PIL import Image
 from redis import StrictRedis
@@ -139,9 +139,9 @@ class RedisListener:
 
     def __init__(
         self,
-        redis_host=REDIS_HOST,
-        redis_password=REDIS_PASSWORD,
-        db=MURKO_REDIS_DB,
+        redis_host=RedisConstants.REDIS_HOST,
+        redis_password=RedisConstants.REDIS_PASSWORD,
+        db=RedisConstants.MURKO_REDIS_DB,
         redis_channel="murko",
     ):
         self.redis_client = StrictRedis(

mx_bluesky/beamlines/i04/thawing_plan.py

@@ -4,8 +4,8 @@ import bluesky.plan_stubs as bps
 import bluesky.preprocessors as bpp
 from bluesky.preprocessors import run_decorator, subs_decorator
 from bluesky.utils import MsgGenerator
-from dodal.beamlines.i04 import MURKO_REDIS_DB, REDIS_HOST, REDIS_PASSWORD
 from dodal.common import inject
+from dodal.devices.i04.constants import RedisConstants
 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
@@ -42,7 +42,13 @@ def thaw_and_stream_to_redis(
     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(REDIS_HOST, REDIS_PASSWORD, MURKO_REDIS_DB))
+    @subs_decorator(
+        MurkoCallback(
+            RedisConstants.REDIS_HOST,
+            RedisConstants.REDIS_PASSWORD,
+            RedisConstants.MURKO_REDIS_DB,
+        )
+    )
     @run_decorator(
         md={
             "microns_per_x_pixel": microns_per_pixel_x,

mx_bluesky/beamlines/i23/__init__.py

@@ -0,0 +1,3 @@
+from mx_bluesky.beamlines.i23.serial import serial_collection
+
+__all__ = ["serial_collection"]

mx_bluesky/beamlines/i23/serial.py

@@ -0,0 +1,71 @@
+from functools import partial
+
+from bluesky import plan_stubs as bps
+from bluesky.plans import rel_grid_scan
+from bluesky.utils import short_uid
+from dodal.beamlines.i23 import I23DetectorPositions
+from dodal.common import inject
+from dodal.devices.motors import SixAxisGonio
+from dodal.devices.positioner import Positioner1D
+from ophyd_async.epics.motor import Motor
+
+
+def set_axis_to_max_velocity(axis: Motor):
+    max_vel = yield from bps.rd(axis.max_velocity)
+    yield from bps.mv(axis.velocity, max_vel)
+
+
+def one_nd_step(
+    detectors,
+    step,
+    pos_cache,
+    omega_axis: Motor,
+    omega_rotation: float,
+    omega_velocity: float,
+):
+    def move():
+        yield from bps.checkpoint()
+        grp = short_uid("set")
+        for motor, pos in step.items():
+            yield from bps.abs_set(motor, pos, group=grp)
+        yield from set_axis_to_max_velocity(omega_axis)
+        yield from bps.abs_set(omega_axis, 0, group=grp)
+        yield from bps.wait(group=grp)
+
+    yield from move()
+    yield from bps.mv(omega_axis.velocity, omega_velocity)
+    yield from bps.mv(omega_axis, omega_rotation)
+
+
+def serial_collection(
+    x_steps: int,
+    y_steps: int,
+    x_step_size: float,
+    y_step_size: float,
+    omega_rotation: float,
+    omega_velocity: float,
+    detector_motion: Positioner1D = inject("detector_motion"),
+    gonio: SixAxisGonio = inject("gonio"),
+):
+    """This plan runs a software controlled serial collection. i.e it moves in a snaked
+    grid and does a small rotation collection at each point."""
+
+    yield from bps.mv(detector_motion.stage_position, I23DetectorPositions.IN)
+    yield from rel_grid_scan(
+        [],
+        gonio.y,
+        0,
+        y_step_size * (y_steps - 1),
+        y_steps,
+        gonio.x,
+        0,
+        x_step_size * (x_steps - 1),
+        x_steps,
+        per_step=partial(  # type: ignore
+            one_nd_step,
+            omega_axis=gonio.omega,
+            omega_rotation=omega_rotation,
+            omega_velocity=omega_velocity,
+        ),
+        snake_axes=True,
+    )

mx_bluesky/beamlines/i24/serial/__init__.py

@@ -1,5 +1,6 @@
 from mx_bluesky.beamlines.i24.serial.web_gui_plans.general_plans import (
     gui_gonio_move_on_click,
+    gui_move_backlight,
     gui_move_detector,
     gui_set_parameters,
     gui_sleep,
@@ -57,4 +58,5 @@ __all__ = [
     "gui_sleep",
     "gui_move_detector",
     "gui_set_parameters",
+    "gui_move_backlight",
 ]

mx_bluesky/beamlines/i24/serial/blueapi_config.yaml

@@ -5,8 +5,9 @@ env:
     - kind: planFunctions
       module: mx_bluesky.beamlines.i24.serial
   events:
-    broadcast_status_events: False
+    broadcast_status_events: false
 api:
   port: 25565
 stomp:
+  enabled: true
   host: i24-control.diamond.ac.uk

mx_bluesky/beamlines/i24/serial/dcid.py

@@ -7,7 +7,7 @@ from functools import lru_cache
 
 import bluesky.plan_stubs as bps
 import requests
-from dodal.beamlines import i24
+from bluesky.utils import MsgGenerator
 from dodal.devices.i24.beam_center import DetectorBeamCenter
 from dodal.devices.i24.dcm import DCM
 from dodal.devices.i24.focus_mirrors import FocusMirrorsMode
@@ -51,7 +51,7 @@ def read_beam_info_from_hardware(
     mirrors: FocusMirrorsMode,
     beam_center: DetectorBeamCenter,
     detector_name: DetectorName,
-):
+) -> MsgGenerator[BeamSettings]:
     """ Read the beam information from hardware.
 
     Args:
@@ -361,7 +361,9 @@ class DCID:
             SSX_LOGGER.warning("Error completing DCID: %s (%s)", e, resp_str)
 
 
-def get_pilatus_filename_template_from_device():
+def get_pilatus_filename_template_from_device(
+    pilatus_metadata: PilatusMetadata,
+) -> MsgGenerator[str]:
     """
     Get the template file path by querying the detector PVs, mirror the construction \
     that the PPU does.
@@ -369,8 +371,6 @@ def get_pilatus_filename_template_from_device():
     Returns:
         A template string, with the image numbers replaced with '#'
     """
-    pilatus_metadata: PilatusMetadata = i24.pilatus_metadata()
-
     filename_template = yield from bps.rd(pilatus_metadata.filename_template)
     return filename_template
 

mx_bluesky/beamlines/i24/serial/extruder/EX-gui-edm/DetStage.edl

@@ -4,7 +4,7 @@ major 4
 minor 0
 release 1
 x 1316
-y 573
+y 610
 w 450
 h 180
 font "arial-medium-r-18.0"
@@ -113,7 +113,7 @@ font "arial-medium-r-18.0"
 buttonLabel "Move Stage"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run setup_detector_stage '\{\"expt_type\":\"Serial Jet\",\"detector_stage\":\"detector_motion\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run setup_detector_stage '\{\"expt_type\":\"Serial Jet\"\}'"
 }
 endObjectProperties
 

mx_bluesky/beamlines/i24/serial/extruder/EX-gui-edm/DiamondExtruder-I24-py3v1.edl

@@ -4,7 +4,7 @@ major 4
 minor 0
 release 1
 x 1006
-y 192
+y 300
 w 700
 h 900
 font "arial-medium-r-18.0"
@@ -370,7 +370,7 @@ font "arial-medium-r-24.0"
 buttonLabel "Start"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run run_extruder_plan '\{\"zebra\":\"zebra\",\"aperture\":\"aperture\",\"backlight\":\"backlight\",\"beamstop\":\"beamstop\",\"detector_stage\":\"detector_motion\",\"shutter\":\"shutter\",\"dcm\":\"dcm\",\"mirrors\":\"focus_mirrors\",\"attenuator\":\"attenuator\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run run_extruder_plan"
 }
 endObjectProperties
 
@@ -832,7 +832,7 @@ botShadowColor index 11
 font "arial-medium-r-18.0"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run initialise_extruder '\{\"detector_stage\":\"detector_motion\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run initialise_extruder"
 }
 endObjectProperties
 
@@ -989,8 +989,8 @@ beginObjectProperties
 major 4
 minor 0
 release 0
-x 10
-y 611
+x 11
+y 606
 w 680
 h 252
 lineColor index 9
@@ -1870,7 +1870,7 @@ beginObjectProperties
 major 4
 minor 1
 release 1
-x 573
+x 568
 y 675
 w 72
 h 46
@@ -2179,7 +2179,7 @@ font "arial-medium-r-20.0"
 buttonLabel "Laser On"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run laser_check '\{\"mode\":\"laseron\",\"zebra\":\"zebra\",\"detector_stage\":\"detector_motion\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run laser_check '\{\"mode\":\"laseron\"\}'"
 }
 endObjectProperties
 
@@ -2201,7 +2201,7 @@ font "arial-medium-r-20.0"
 buttonLabel "Laser Off"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run laser_check '\{\"mode\":\"laseroff\",\"zebra\":\"zebra\",\"detector_stage\":\"detector_motion\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run laser_check '\{\"mode\":\"laseroff\"\}'"
 }
 endObjectProperties
 
@@ -2223,7 +2223,7 @@ font "arial-medium-r-18.0"
 buttonLabel "Enter hutch"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run enter_hutch '\{\"detector_stage\":\"detector_motion\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run enter_hutch"
 }
 endObjectProperties
 

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

@@ -24,6 +24,7 @@ from dodal.devices.i24.dcm import DCM
 from dodal.devices.i24.dual_backlight import DualBacklight
 from dodal.devices.i24.focus_mirrors import FocusMirrorsMode
 from dodal.devices.i24.i24_detector_motion import DetectorMotion
+from dodal.devices.i24.pilatus_metadata import PilatusMetadata
 from dodal.devices.zebra.zebra import Zebra
 
 from mx_bluesky.beamlines.i24.serial.dcid import (
@@ -37,7 +38,10 @@ from mx_bluesky.beamlines.i24.serial.log import (
     log_on_entry,
 )
 from mx_bluesky.beamlines.i24.serial.parameters import ExtruderParameters
-from mx_bluesky.beamlines.i24.serial.parameters.constants import BEAM_CENTER_LUT_FILES
+from mx_bluesky.beamlines.i24.serial.parameters.constants import (
+    BEAM_CENTER_LUT_FILES,
+    DetectorName,
+)
 from mx_bluesky.beamlines.i24.serial.setup_beamline import Pilatus, caget, caput, pv
 from mx_bluesky.beamlines.i24.serial.setup_beamline import setup_beamline as sup
 from mx_bluesky.beamlines.i24.serial.setup_beamline.setup_detector import (
@@ -212,6 +216,7 @@ def main_extruder_plan(
     parameters: ExtruderParameters,
     dcid: DCID,
     start_time: datetime,
+    pilatus_metadata: PilatusMetadata,
 ) -> MsgGenerator:
     beam_center_pixels = sup.compute_beam_center_position_from_lut(
         BEAM_CENTER_LUT_FILES[parameters.detector_name],
@@ -317,6 +322,7 @@ def main_extruder_plan(
                     parameters.num_images,
                     parameters.exposure_time_s,
                 ],
+                dcm,
             )
             yield from setup_zebra_for_extruder_with_pump_probe_plan(
                 zebra,
@@ -338,6 +344,7 @@ def main_extruder_plan(
                     parameters.num_images,
                     parameters.exposure_time_s,
                 ],
+                dcm,
             )
             yield from setup_zebra_for_quickshot_plan(
                 zebra, parameters.exposure_time_s, parameters.num_images, wait=True
@@ -355,7 +362,9 @@ def main_extruder_plan(
     if parameters.detector_name == "eiger":
         filetemplate = f"{parameters.filename}.nxs"
     else:
-        filetemplate = yield from get_pilatus_filename_template_from_device()
+        filetemplate = yield from get_pilatus_filename_template_from_device(
+            pilatus_metadata
+        )
     dcid.generate_dcid(
         beam_settings=beam_settings,
         image_dir=parameters.collection_directory.as_posix(),
@@ -441,6 +450,7 @@ def tidy_up_at_collection_end_plan(
     shutter: HutchShutter,
     parameters: ExtruderParameters,
     dcid: DCID,
+    dcm: DCM,
 ) -> MsgGenerator:
     """A plan to tidy up at the end of a collection, successful or aborted.
 
@@ -455,7 +465,7 @@ def tidy_up_at_collection_end_plan(
     if parameters.detector_name == "pilatus":
         yield from sup.pilatus("return-to-normal", None)
     elif parameters.detector_name == "eiger":
-        yield from sup.eiger("return-to-normal", None)
+        yield from sup.eiger("return-to-normal", None, dcm)
         SSX_LOGGER.debug(f"{parameters.filename}_{caget(pv.eiger_seqID)}")
     SSX_LOGGER.debug("End of Run")
     SSX_LOGGER.info("Close hutch shutter")
@@ -495,6 +505,9 @@ def run_extruder_plan(
     dcm: DCM = inject("dcm"),
     mirrors: FocusMirrorsMode = inject("focus_mirrors"),
     attenuator: ReadOnlyAttenuator = inject("attenuator"),
+    beam_center_eiger: DetectorBeamCenter = inject("eiger_bc"),
+    beam_center_pilatus: DetectorBeamCenter = inject("pilatus_bc"),
+    pilatus_metadata: PilatusMetadata = inject("pilatus_meta"),
 ) -> MsgGenerator:
     start_time = datetime.now()
     SSX_LOGGER.info(f"Collection start time: {start_time.ctime()}")
@@ -505,7 +518,11 @@ def run_extruder_plan(
     # Create collection directory
     parameters.collection_directory.mkdir(parents=True, exist_ok=True)
 
-    beam_center_device = sup.get_beam_center_device(parameters.detector_name)
+    beam_center_device = (
+        beam_center_eiger
+        if parameters.detector_name is DetectorName.EIGER
+        else beam_center_pilatus
+    )
 
     # DCID - not generated yet
     dcid = DCID(emit_errors=False, expt_params=parameters)
@@ -524,6 +541,7 @@ def run_extruder_plan(
             parameters=parameters,
             dcid=dcid,
             start_time=start_time,
+            pilatus_metadata=pilatus_metadata,
         ),
         except_plan=lambda e: (
             yield from collection_aborted_plan(zebra, parameters.detector_name, dcid)
@@ -534,7 +552,9 @@ def run_extruder_plan(
             )
         ),
         final_plan=lambda: (
-            yield from tidy_up_at_collection_end_plan(zebra, shutter, parameters, dcid)
+            yield from tidy_up_at_collection_end_plan(
+                zebra, shutter, parameters, dcid, dcm
+            )
         ),
         auto_raise=False,
     )

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 579
+y 616
 w 450
 h 180
 font "arial-medium-r-18.0"
@@ -113,7 +113,7 @@ font "arial-medium-r-18.0"
 buttonLabel "Move Stage"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run setup_detector_stage '\{\"expt_type\":\"Serial Fixed\",\"detector_stage\":\"detector_motion\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run setup_detector_stage '\{\"expt_type\":\"Serial Fixed\"\}'"
 }
 endObjectProperties
 

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

@@ -3,8 +3,8 @@ beginScreenProperties
 major 4
 minor 0
 release 1
-x 844
-y 238
+x 843
+y 206
 w 1030
 h 950
 font "arial-medium-r-18.0"
@@ -280,7 +280,7 @@ botShadowColor index 14
 font "arial-medium-r-18.0"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run moveto_preset '\{\"place\":\"load_position\",\"pmac\":\"pmac\",\"beamstop\":\"beamstop\",\"backlight\":\"backlight\",\"det_stage\":\"detector_motion\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run moveto_preset '\{\"place\":\"load_position\"\}'"
 }
 endObjectProperties
 
@@ -301,7 +301,7 @@ botShadowColor index 14
 font "arial-medium-r-18.0"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run moveto_preset '\{\"place\":\"collect_position\",\"pmac\":\"pmac\",\"beamstop\":\"beamstop\",\"backlight\":\"backlight\",\"det_stage\":\"detector_motion\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run moveto_preset '\{\"place\":\"collect_position\"\}'"
 }
 endObjectProperties
 
@@ -323,7 +323,7 @@ font "helvetica-bold-r-24.0"
 buttonLabel "Start"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run run_fixed_target_plan '\{\"zebra\":\"zebra\",\"pmac\":\"pmac\",\"aperture\":\"aperture\",\"backlight\":\"backlight\",\"beamstop\":\"beamstop\",\"detector_stage\":\"detector_motion\",\"shutter\":\"shutter\",\"dcm\":\"dcm\",\"mirrors\":\"focus_mirrors\",\"attenuator\":\"attenuator\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run run_fixed_target_plan"
 }
 endObjectProperties
 
@@ -615,7 +615,7 @@ botShadowColor index 14
 font "arial-medium-r-18.0"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run cs_maker '\{\"pmac\":\"pmac\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run cs_maker"
 }
 endObjectProperties
 
@@ -1157,7 +1157,7 @@ botShadowColor index 14
 font "arial-medium-r-18.0"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run initialise_stages '\{\"pmac\":\"pmac\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run initialise_stages"
 }
 endObjectProperties
 
@@ -1538,7 +1538,7 @@ botShadowColor index 14
 font "arial-medium-r-18.0"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run block_check '\{\"pmac\":\"pmac\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run block_check"
 }
 endObjectProperties
 
@@ -2912,7 +2912,7 @@ font "helvetica-medium-r-18.0"
 buttonLabel "Set Fiducial 2"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run fiducial '\{\"point\":\"2\",\"pmac\":\"pmac\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run fiducial '\{\"point\":\"2\"\}'"
 }
 endObjectProperties
 
@@ -2934,7 +2934,7 @@ font "helvetica-medium-r-18.0"
 buttonLabel "Goto Fiducial 2"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run moveto '\{\"place\":\"f2\",\"pmac\":\"pmac\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run moveto '\{\"place\":\"f2\"\}'"
 }
 endObjectProperties
 
@@ -2978,7 +2978,7 @@ font "helvetica-medium-r-18.0"
 buttonLabel "Set Fiducial 1"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run fiducial '\{\"point\":\"1\",\"pmac\":\"pmac\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run fiducial '\{\"point\":\"1\"\}'"
 }
 endObjectProperties
 
@@ -3000,7 +3000,7 @@ font "helvetica-medium-r-18.0"
 buttonLabel "Goto Fiducial 1"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run moveto '\{\"place\":\"f1\",\"pmac\":\"pmac\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run moveto '\{\"place\":\"f1\"\}'"
 }
 endObjectProperties
 
@@ -3731,7 +3731,7 @@ botShadowColor index 14
 font "arial-medium-r-18.0"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run moveto '\{\"place\":\"zero\",\"pmac\":\"pmac\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run moveto '\{\"place\":\"zero\"\}'"
 }
 endObjectProperties
 
@@ -3773,7 +3773,7 @@ botShadowColor index 14
 font "arial-medium-r-18.0"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run moveto_preset '\{\"place\":\"microdrop_position\",\"pmac\":\"pmac\",\"beamstop\":\"beamstop\",\"backlight\":\"backlight\",\"det_stage\":\"detector_motion\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run moveto_preset '\{\"place\":\"microdrop_position\"\}'"
 }
 endObjectProperties