mx-bluesky 1.5.3__py3-none-any.whl → 1.5.5__py3-none-any.whl

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

@@ -51,7 +51,7 @@ x 188
 y 17
 w 178
 h 43
-controlPv "ME14E-MO-CHIP-01:PMAC_STRING"
+controlPv "BL24I-EA-CHIP-01:PMAC_STRING"
 fgColor index 25
 fgAlarm
 bgColor index 5
@@ -69,7 +69,7 @@ x 188
 y 88
 w 198
 h 23
-controlPv "ME14E-MO-CHIP-01:SEND_STRING.AINP"
+controlPv "BL24I-EA-CHIP-01:SEND_STRING.AINP"
 font "arial-medium-r-18.0"
 fgColor index 16
 bgColor index 14

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

@@ -37,8 +37,8 @@ selectColor index 15
 inconsistentColor index 14
 topShadowColor index 0
 botShadowColor index 14
-controlPv "ME14E-MO-CHIP-01:SHUTTER_CTRL"
-indicatorPv "ME14E-MO-CHIP-01:SHUTTER_STATE_RBV"
+controlPv "BL24I-EA-CHIP-01:SHUTTER_CTRL"
+indicatorPv "BL24I-EA-CHIP-01:SHUTTER_STATE_RBV"
 font "arial-medium-r-18.0"
 orientation "horizontal"
 endObjectProperties
@@ -53,7 +53,7 @@ x 175
 y 95
 w 141
 h 23
-controlPv "ME14E-MO-CHIP-01:SHUTTER_STATE_RBV"
+controlPv "BL24I-EA-CHIP-01:SHUTTER_STATE_RBV"
 font "arial-medium-r-18.0"
 fgColor index 14
 bgColor index 0

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

@@ -71,7 +71,7 @@ x 143
 y 291
 w 166
 h 33
-controlPv "ME14E-MO-CHIP-01:PMAC_STRING"
+controlPv "BL24I-EA-CHIP-01:PMAC_STRING"
 fgColor index 25
 fgAlarm
 bgColor index 5
@@ -89,7 +89,7 @@ x 139
 y 331
 w 167
 h 21
-controlPv "ME14E-MO-CHIP-01:SEND_STRING.AINP"
+controlPv "BL24I-EA-CHIP-01:SEND_STRING.AINP"
 font "arial-medium-r-16.0"
 fgColor index 16
 bgColor index 14
@@ -226,7 +226,7 @@ x 342
 y 281
 w 87
 h 23
-controlPv "ME14E-MO-CHIP-01:X.RBV"
+controlPv "BL24I-EA-CHIP-01:X.RBV"
 font "arial-medium-r-18.0"
 fgColor index 25
 bgColor index 5
@@ -308,7 +308,7 @@ x 344
 y 307
 w 87
 h 23
-controlPv "ME14E-MO-CHIP-01:Y.RBV"
+controlPv "BL24I-EA-CHIP-01:Y.RBV"
 font "arial-medium-r-18.0"
 fgColor index 25
 bgColor index 5
@@ -350,7 +350,7 @@ x 343
 y 333
 w 87
 h 23
-controlPv "ME14E-MO-CHIP-01:Z.RBV"
+controlPv "BL24I-EA-CHIP-01:Z.RBV"
 font "arial-medium-r-18.0"
 fgColor index 25
 bgColor index 5
@@ -377,7 +377,7 @@ onColor index 3
 offColor index 3
 topShadowColor index 3
 botShadowColor index 14
-controlPv "ME14E-MO-CHIP-01:PMAC_STRING"
+controlPv "BL24I-EA-CHIP-01:PMAC_STRING"
 pressValue "#1J:-2500"
 releaseValue "#1P"
 3d
@@ -399,7 +399,7 @@ onColor index 3
 offColor index 3
 topShadowColor index 3
 botShadowColor index 14
-controlPv "ME14E-MO-CHIP-01:PMAC_STRING"
+controlPv "BL24I-EA-CHIP-01:PMAC_STRING"
 pressValue "#1J:-25000"
 releaseValue "#1P"
 3d
@@ -421,7 +421,7 @@ onColor index 3
 offColor index 3
 topShadowColor index 3
 botShadowColor index 14
-controlPv "ME14E-MO-CHIP-01:PMAC_STRING"
+controlPv "BL24I-EA-CHIP-01:PMAC_STRING"
 pressValue "#1J:-20"
 releaseValue "#1P"
 3d
@@ -443,7 +443,7 @@ onColor index 3
 offColor index 3
 topShadowColor index 3
 botShadowColor index 14
-controlPv "ME14E-MO-CHIP-01:PMAC_STRING"
+controlPv "BL24I-EA-CHIP-01:PMAC_STRING"
 pressValue "#1J:25000"
 releaseValue "#1P"
 3d
@@ -465,7 +465,7 @@ onColor index 3
 offColor index 3
 topShadowColor index 3
 botShadowColor index 14
-controlPv "ME14E-MO-CHIP-01:PMAC_STRING"
+controlPv "BL24I-EA-CHIP-01:PMAC_STRING"
 pressValue "#1J:2500"
 releaseValue "#1P"
 3d
@@ -487,7 +487,7 @@ onColor index 3
 offColor index 3
 topShadowColor index 3
 botShadowColor index 14
-controlPv "ME14E-MO-CHIP-01:PMAC_STRING"
+controlPv "BL24I-EA-CHIP-01:PMAC_STRING"
 pressValue "#1J:20"
 releaseValue "#1P"
 3d
@@ -509,7 +509,7 @@ onColor index 3
 offColor index 3
 topShadowColor index 3
 botShadowColor index 14
-controlPv "ME14E-MO-CHIP-01:PMAC_STRING"
+controlPv "BL24I-EA-CHIP-01:PMAC_STRING"
 pressValue "#2J:22000"
 releaseValue "#2P"
 3d
@@ -531,7 +531,7 @@ onColor index 3
 offColor index 3
 topShadowColor index 3
 botShadowColor index 14
-controlPv "ME14E-MO-CHIP-01:PMAC_STRING"
+controlPv "BL24I-EA-CHIP-01:PMAC_STRING"
 pressValue "#2J:2500"
 releaseValue "#2P"
 3d
@@ -553,7 +553,7 @@ onColor index 3
 offColor index 3
 topShadowColor index 3
 botShadowColor index 14
-controlPv "ME14E-MO-CHIP-01:PMAC_STRING"
+controlPv "BL24I-EA-CHIP-01:PMAC_STRING"
 pressValue "#2J:20"
 releaseValue "#2P"
 3d
@@ -575,7 +575,7 @@ onColor index 3
 offColor index 3
 topShadowColor index 3
 botShadowColor index 14
-controlPv "ME14E-MO-CHIP-01:PMAC_STRING"
+controlPv "BL24I-EA-CHIP-01:PMAC_STRING"
 pressValue "#2J:-22000"
 releaseValue "#2P"
 3d
@@ -597,7 +597,7 @@ onColor index 3
 offColor index 3
 topShadowColor index 3
 botShadowColor index 14
-controlPv "ME14E-MO-CHIP-01:PMAC_STRING"
+controlPv "BL24I-EA-CHIP-01:PMAC_STRING"
 pressValue "#2J:-2500"
 releaseValue "#2P"
 3d
@@ -619,7 +619,7 @@ onColor index 3
 offColor index 3
 topShadowColor index 3
 botShadowColor index 14
-controlPv "ME14E-MO-CHIP-01:PMAC_STRING"
+controlPv "BL24I-EA-CHIP-01:PMAC_STRING"
 pressValue "#2J:-20"
 releaseValue "#2P"
 3d
@@ -721,7 +721,7 @@ onColor index 3
 offColor index 3
 topShadowColor index 3
 botShadowColor index 14
-controlPv "ME14E-MO-CHIP-01:PMAC_STRING"
+controlPv "BL24I-EA-CHIP-01:PMAC_STRING"
 pressValue "#3J:250"
 releaseValue "#2P"
 3d
@@ -743,7 +743,7 @@ onColor index 3
 offColor index 3
 topShadowColor index 3
 botShadowColor index 14
-controlPv "ME14E-MO-CHIP-01:PMAC_STRING"
+controlPv "BL24I-EA-CHIP-01:PMAC_STRING"
 pressValue "#3J:-250"
 releaseValue "#2P"
 3d
@@ -805,8 +805,8 @@ onColor index 3
 offColor index 3
 topShadowColor index 3
 botShadowColor index 14
-controlPv "ME14E-MO-CHIP-01:PMAC_STRING"
-pressValue "#1hmz#2hmz#3hmz"
+controlPv "BL24I-EA-CHIP-01:PMAC_STRING"
+pressValue "#5hmz#6hmz#7hmz"
 3d
 font "arial-medium-r-18.0"
 endObjectProperties
@@ -949,7 +949,7 @@ onColor index 3
 offColor index 3
 topShadowColor index 3
 botShadowColor index 14
-controlPv "ME14E-MO-CHIP-01:PMAC_STRING"
+controlPv "BL24I-EA-CHIP-01:PMAC_STRING"
 pressValue "ver"
 3d
 font "arial-medium-r-18.0"
@@ -1020,7 +1020,7 @@ onColor index 3
 offColor index 3
 topShadowColor index 3
 botShadowColor index 14
-controlPv "ME14E-MO-CHIP-01:PMAC_STRING"
+controlPv "BL24I-EA-CHIP-01:PMAC_STRING"
 pressValue "ver"
 3d
 font "arial-medium-r-18.0"
@@ -1165,6 +1165,6 @@ botShadowColor index 14
 font "arial-medium-r-18.0"
 numCmds 1
 command {
-  0 "caget ME14E-MO-CHIP-01:X"
+  0 "caget BL24I-EA-CHIP-01:X"
 }
 endObjectProperties

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

@@ -160,7 +160,7 @@ botShadowColor index 11
 font "arial-medium-r-18.0"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run pumpprobe_calc"
+  0 "blueapi -c CONFIG_LOCATION controller run -i $INSTRUMENT_SESSION pumpprobe_calc"
 }
 endObjectProperties
 
@@ -195,7 +195,7 @@ x 155
 y 428
 w 75
 h 25
-controlPv "ME14E-MO-CHIP-01:expTime"
+controlPv "BL24I-EA-CHIP-01:expTime"
 font "arial-medium-r-16.0"
 fgColor index 16
 bgColor index 10
@@ -216,7 +216,7 @@ x 422
 y 398
 w 75
 h 25
-controlPv "ME14E-MO-IOC-01:GP104"
+controlPv "BL24I-MO-IOC-01:GP104"
 font "arial-medium-r-16.0"
 fgColor index 16
 bgColor index 10
@@ -553,7 +553,7 @@ x 422
 y 431
 w 75
 h 25
-controlPv "ME14E-MO-IOC-01:GP105"
+controlPv "BL24I-MO-IOC-01:GP105"
 font "arial-medium-r-16.0"
 fgColor index 16
 bgColor index 10
@@ -574,7 +574,7 @@ x 422
 y 464
 w 75
 h 25
-controlPv "ME14E-MO-IOC-01:GP106"
+controlPv "BL24I-MO-IOC-01:GP106"
 font "arial-medium-r-16.0"
 fgColor index 16
 bgColor index 10
@@ -595,7 +595,7 @@ x 422
 y 495
 w 75
 h 25
-controlPv "ME14E-MO-IOC-01:GP107"
+controlPv "BL24I-MO-IOC-01:GP107"
 font "arial-medium-r-16.0"
 fgColor index 16
 bgColor index 10
@@ -616,7 +616,7 @@ x 422
 y 526
 w 75
 h 25
-controlPv "ME14E-MO-IOC-01:GP108"
+controlPv "BL24I-MO-IOC-01:GP108"
 font "arial-medium-r-16.0"
 fgColor index 16
 bgColor index 10
@@ -658,7 +658,7 @@ x 156
 y 382
 w 75
 h 25
-controlPv "ME14E-MO-IOC-01:GP103"
+controlPv "BL24I-MO-IOC-01:GP103"
 font "helvetica-medium-r-18.0"
 fgColor index 25
 bgColor index 3
@@ -707,7 +707,7 @@ botShadowColor index 14
 font "arial-medium-r-18.0"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run laser_control '\{\"laser_setting\":\"laser1off\",\"pmac\":\"pmac\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run -i $INSTRUMENT_SESSION laser_control '\{\"laser_setting\":\"laser1off\",\"pmac\":\"pmac\"\}'"
 }
 endObjectProperties
 
@@ -749,7 +749,7 @@ botShadowColor index 14
 font "arial-medium-r-18.0"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run laser_control '\{\"laser_setting\":\"laser1on\",\"pmac\":\"pmac\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run -i $INSTRUMENT_SESSION laser_control '\{\"laser_setting\":\"laser1on\",\"pmac\":\"pmac\"\}'"
 }
 endObjectProperties
 
@@ -866,7 +866,7 @@ x 141
 y 637
 w 75
 h 25
-controlPv "ME14E-MO-IOC-01:GP109"
+controlPv "BL24I-MO-IOC-01:GP109"
 font "helvetica-medium-r-18.0"
 fgColor index 25
 bgColor index 3
@@ -976,7 +976,7 @@ botShadowColor index 14
 font "arial-medium-r-18.0"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run laser_control '\{\"laser_setting\":\"laser2off\",\"pmac\":\"pmac\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run -i $INSTRUMENT_SESSION laser_control '\{\"laser_setting\":\"laser2off\",\"pmac\":\"pmac\"\}'"
 }
 endObjectProperties
 
@@ -1018,7 +1018,7 @@ botShadowColor index 14
 font "arial-medium-r-18.0"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run laser_control '\{\"laser_setting\":\"laser2on\",\"pmac\":\"pmac\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run -i $INSTRUMENT_SESSION laser_control '\{\"laser_setting\":\"laser2on\",\"pmac\":\"pmac\"\}'"
 }
 endObjectProperties
 
@@ -1058,7 +1058,7 @@ fontAlign "center"
 fgColor index 38
 bgColor index 0
 useDisplayBg
-visPv "ME14E-MO-IOC-01:GP109"
+visPv "BL24I-MO-IOC-01:GP109"
 visMin "0.00001"
 visMax "999"
 value {
@@ -1158,7 +1158,7 @@ x 144
 y 124
 w 75
 h 25
-controlPv "ME14E-MO-IOC-01:GP103"
+controlPv "BL24I-MO-IOC-01:GP103"
 font "helvetica-medium-r-18.0"
 fgColor index 25
 bgColor index 3
@@ -1334,7 +1334,7 @@ botShadowColor index 14
 font "arial-medium-r-18.0"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run laser_control '\{\"laser_setting\":\"laser1burn\",\"pmac\":\"pmac\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run -i $INSTRUMENT_SESSION laser_control '\{\"laser_setting\":\"laser1burn\",\"pmac\":\"pmac\"\}'"
 }
 endObjectProperties
 
@@ -1376,7 +1376,7 @@ botShadowColor index 14
 font "arial-medium-r-18.0"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run laser_control '\{\"laser_setting\":\"laser2burn\",\"pmac\":\"pmac\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run -i $INSTRUMENT_SESSION laser_control '\{\"laser_setting\":\"laser2burn\",\"pmac\":\"pmac\"\}'"
 }
 endObjectProperties
 
@@ -1451,7 +1451,7 @@ x 144
 y 155
 w 75
 h 25
-controlPv "ME14E-MO-IOC-01:GP110"
+controlPv "BL24I-MO-IOC-01:GP110"
 font "helvetica-medium-r-18.0"
 fgColor index 25
 bgColor index 3
@@ -1573,7 +1573,7 @@ fgColor index 14
 bgColor index 3
 topShadowColor index 1
 botShadowColor index 8
-controlPv "ME14E-MO-IOC-01:GP111"
+controlPv "BL24I-MO-IOC-01:GP111"
 font "arial-medium-r-18.0"
 numItems 2
 symbolTag {

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

@@ -18,14 +18,12 @@ from dodal.devices.i24.beamstop import Beamstop
 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.pilatus_metadata import PilatusMetadata
 from dodal.devices.i24.pmac import PMAC
 from dodal.devices.motors import YZStage
 from dodal.devices.zebra.zebra import Zebra
 
 from mx_bluesky.beamlines.i24.serial.dcid import (
     DCID,
-    get_pilatus_filename_template_from_device,
     read_beam_info_from_hardware,
 )
 from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import (
@@ -41,7 +39,6 @@ from mx_bluesky.beamlines.i24.serial.log import SSX_LOGGER, log_on_entry
 from mx_bluesky.beamlines.i24.serial.parameters import FixedTargetParameters
 from mx_bluesky.beamlines.i24.serial.parameters.constants import (
     BEAM_CENTER_LUT_FILES,
-    DetectorName,
 )
 from mx_bluesky.beamlines.i24.serial.setup_beamline import caget, cagetstring, caput, pv
 from mx_bluesky.beamlines.i24.serial.setup_beamline import setup_beamline as sup
@@ -276,7 +273,6 @@ def start_i24(
     mirrors: FocusMirrorsMode,
     beam_center_device: DetectorBeamCenter,
     dcid: DCID,
-    pilatus_metadata: PilatusMetadata,
 ):
     """Set up for I24 fixed target data collection, trigger the detector and open \
     the hutch shutter.
@@ -312,67 +308,7 @@ def start_i24(
     SSX_LOGGER.info(f"Number of exposures: {parameters.num_exposures}")
     SSX_LOGGER.info(f"Number of gates (=Total images/N exposures): {num_gates:.4f}")
 
-    if parameters.detector_name == "pilatus":
-        SSX_LOGGER.info("Using Pilatus detector")
-        SSX_LOGGER.info(f"Fastchip Pilatus setup: filepath {filepath}")
-        SSX_LOGGER.info(f"Fastchip Pilatus setup: filename {filename}")
-        SSX_LOGGER.info(
-            f"Fastchip Pilatus setup: number of images {parameters.total_num_images}"
-        )
-        SSX_LOGGER.info(
-            f"Fastchip Pilatus setup: exposure time {parameters.exposure_time_s}"
-        )
-
-        yield from sup.pilatus(
-            "fastchip",
-            [
-                filepath,
-                filename,
-                parameters.total_num_images,
-                parameters.exposure_time_s,
-            ],
-        )
-
-        # DCID process depends on detector PVs being set up already
-        SSX_LOGGER.debug("Start DCID process")
-        filetemplate = yield from get_pilatus_filename_template_from_device(
-            pilatus_metadata
-        )
-        dcid.generate_dcid(
-            beam_settings=beam_settings,
-            image_dir=filepath,
-            file_template=filetemplate,
-            num_images=parameters.total_num_images,
-            shots_per_position=parameters.num_exposures,
-            start_time=start_time,
-            pump_probe=bool(parameters.pump_repeat),
-        )
-
-        SSX_LOGGER.debug("Arm Pilatus. Arm Zebra.")
-        shutter_time_offset = (
-            SHUTTER_OPEN_TIME
-            if parameters.pump_repeat is PumpProbeSetting.Medium1
-            else 0.0
-        )
-        yield from setup_zebra_for_fastchip_plan(
-            zebra,
-            parameters.detector_name,
-            num_gates,
-            parameters.num_exposures,
-            parameters.exposure_time_s,
-            shutter_time_offset,
-            wait=True,
-        )
-        if parameters.pump_repeat == PumpProbeSetting.Medium1:
-            yield from open_fast_shutter_at_each_position_plan(
-                zebra, parameters.num_exposures, parameters.exposure_time_s
-            )
-        caput(pv.pilat_acquire, "1")  # Arm pilatus
-        yield from arm_zebra(zebra)
-        caput(pv.pilat_filename, filename)
-        yield from bps.sleep(1.5)
-
-    elif parameters.detector_name == "eiger":
+    if parameters.detector_name == "eiger":
         SSX_LOGGER.info("Using Eiger detector")
 
         SSX_LOGGER.debug(f"Creating the directory for the collection in {filepath}.")
@@ -458,22 +394,16 @@ def finish_i24(
     )
 
     complete_filename: str
-    transmission = float(caget(pv.pilat_filtertrasm))
+    transmission = float(caget(pv.requested_transmission))
     wavelength = yield from bps.rd(dcm.wavelength_in_a)
 
-    if parameters.detector_name == "pilatus":
-        SSX_LOGGER.debug("Finish I24 Pilatus")
-        complete_filename = f"{parameters.filename}_{caget(pv.pilat_filenum)}"
-        yield from reset_zebra_when_collection_done_plan(zebra)
-        yield from sup.pilatus("return-to-normal", None)
-        yield from bps.sleep(0.2)
-    elif parameters.detector_name == "eiger":
+    if parameters.detector_name == "eiger":
         SSX_LOGGER.debug("Finish I24 Eiger")
         yield from reset_zebra_when_collection_done_plan(zebra)
         yield from sup.eiger("return-to-normal", None, dcm)
         complete_filename = cagetstring(pv.eiger_ODfilenameRBV)  # type: ignore
     else:
-        raise ValueError(f"{parameters.detector_name=} unrecognised")
+        raise ValueError(f"{parameters.detector_name} unrecognised")
 
     # Detector independent moves
     SSX_LOGGER.info("Move chip back to home position by setting PMAC_STRING pv.")
@@ -513,7 +443,6 @@ def main_fixed_target_plan(
     beam_center_device: DetectorBeamCenter,
     parameters: FixedTargetParameters,
     dcid: DCID,
-    pilatus_metadata: PilatusMetadata,
 ) -> MsgGenerator:
     SSX_LOGGER.info("Running a chip collection on I24")
 
@@ -558,7 +487,6 @@ def main_fixed_target_plan(
         mirrors,
         beam_center_device,
         dcid,
-        pilatus_metadata,
     )
 
     SSX_LOGGER.info("Moving to Start")
@@ -578,7 +506,7 @@ def main_fixed_target_plan(
         beam_x = yield from bps.rd(beam_center_device.beam_x)
         beam_y = yield from bps.rd(beam_center_device.beam_y)
         SSX_LOGGER.debug("Start nexus writing service.")
-        call_nexgen(
+        yield from call_nexgen(
             chip_prog_dict, parameters, wavelength, (beam_x, beam_y), start_time
         )
 
@@ -631,14 +559,11 @@ def tidy_up_after_collection_plan(
     yield from bps.sleep(2.0)
 
     # This probably should go in main then
-    if parameters.detector_name == "pilatus":
-        SSX_LOGGER.debug("Pilatus Acquire STOP")
-        caput(pv.pilat_acquire, 0)
-    elif parameters.detector_name == "eiger":
+    if parameters.detector_name == "eiger":
         SSX_LOGGER.debug("Eiger Acquire STOP")
         caput(pv.eiger_acquire, 0)
         caput(pv.eiger_ODcapture, "Done")
-    yield from bps.sleep(0.5)
+        yield from bps.sleep(0.5)
 
     yield from finish_i24(zebra, pmac, shutter, dcm, parameters)
 
@@ -663,8 +588,6 @@ def run_fixed_target_plan(
     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:
     # Read the parameters
     parameters: FixedTargetParameters = yield from read_parameters(
@@ -677,11 +600,7 @@ def run_fixed_target_plan(
     if parameters.chip_map:
         yield from upload_chip_map_to_geobrick(pmac, parameters.chip_map)
 
-    beam_center_device = (
-        beam_center_eiger
-        if parameters.detector_name is DetectorName.EIGER
-        else beam_center_pilatus
-    )
+    beam_center_device = beam_center_eiger
 
     # DCID instance - do not create yet
     dcid = DCID(emit_errors=False, expt_params=parameters)
@@ -699,7 +618,6 @@ def run_fixed_target_plan(
         beam_center_device,
         parameters,
         dcid,
-        pilatus_metadata,
     )
 
 
@@ -716,7 +634,6 @@ def run_plan_in_wrapper(
     beam_center_device: DetectorBeamCenter,
     parameters: FixedTargetParameters,
     dcid: DCID,
-    pilatus_metadata: PilatusMetadata,
 ) -> MsgGenerator:
     yield from bpp.contingency_wrapper(
         main_fixed_target_plan(
@@ -732,7 +649,6 @@ def run_plan_in_wrapper(
             beam_center_device,
             parameters,
             dcid,
-            pilatus_metadata,
         ),
         except_plan=lambda e: (yield from run_aborted_plan(pmac, dcid, e)),
         final_plan=lambda: (