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

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: (

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

@@ -4,7 +4,6 @@ This version changed to python3 March2020 by RLO
 """
 
 import json
-import re
 import sys
 from pathlib import Path
 from pprint import pformat
@@ -40,7 +39,7 @@ from mx_bluesky.beamlines.i24.serial.parameters.constants import (
     PARAM_FILE_PATH_FT,
     PVAR_FILE_PATH,
 )
-from mx_bluesky.beamlines.i24.serial.setup_beamline import Pilatus, caget, caput, pv
+from mx_bluesky.beamlines.i24.serial.setup_beamline import caget, caput, pv
 from mx_bluesky.beamlines.i24.serial.setup_beamline.setup_detector import (
     get_detector_type,
 )
@@ -96,8 +95,6 @@ def initialise_stages(
     yield from bps.abs_set(pmac.enc_reset, EncReset.ENC7, group=group)
     yield from bps.abs_set(pmac.enc_reset, EncReset.ENC8, group=group)
 
-    caput(pv.pilat_cbftemplate, 0)
-
     yield from bps.sleep(0.1)
     SSX_LOGGER.info("Clearing General Purpose PVs 1-120")
     for i in range(4, 120):
@@ -151,19 +148,6 @@ def read_parameters(
         chip_map = []
     pump_repeat = int(caget(PUMP_REPEAT_PV))
 
-    # If file name ends in a digit this causes processing/pilatus pain.
-    # Append an underscore
-    if isinstance(det_type, Pilatus):
-        caput(pv.pilat_cbftemplate, 0)
-        m = re.search(r"\d+$", filename)
-        if m is not None:
-            # Note for future reference. Appending underscore causes more hassle and
-            # high probability of users accidentally overwriting data. Use a dash
-            filename = filename + "-"
-            SSX_LOGGER.debug(
-                f"Requested filename ends in a number. Appended dash: {filename}"
-            )
-
     transmission = yield from bps.rd(attenuator.actual_transmission)
 
     params_dict = {
@@ -892,7 +876,7 @@ def pumpprobe_calc() -> MsgGenerator:
     SSX_LOGGER.info("Calculate and show exposure and dwell time for each option.")
     exptime = float(caget(pv.me14e_exptime))
     pumpexptime = float(caget(pv.me14e_gp103))
-    movetime = 0.008
+    movetime = 0.014
     SSX_LOGGER.info(f"X-ray exposure time {exptime}")
     SSX_LOGGER.info(f"Laser dwell time {pumpexptime}")
     repeat1 = 2 * 20 * (movetime + (pumpexptime + exptime) / 2)

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

@@ -12,7 +12,6 @@ class SSXType(StrEnum):
 
 class DetectorName(StrEnum):
     EIGER = "eiger"
-    PILATUS = "pilatus"
 
 
 # TODO figue sth out for tests
@@ -20,7 +19,6 @@ LUT_FILES_PATH = Path("/dls_sw/i24/software/daq_configuration/lookup")
 
 BEAM_CENTER_LUT_FILES = {
     DetectorName.EIGER: LUT_FILES_PATH / "DetDistToBeamXYConverterE9M.txt",
-    DetectorName.PILATUS: LUT_FILES_PATH / "DetDistToBeamXYConverterP6M.txt",
 }
 
 

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

@@ -5,7 +5,6 @@ from pathlib import Path
 import numpy as np
 from dodal.devices.detector.det_dim_constants import (
     EIGER2_X_9M_SIZE,
-    PILATUS_6M_SIZE,
     DetectorSizeConstants,
 )
 from pydantic import BaseModel, ConfigDict, computed_field, field_validator
@@ -46,11 +45,7 @@ class SerialExperiment(BaseModel):
 
     @property
     def detector_size_constants(self) -> DetectorSizeConstants:
-        return (
-            EIGER2_X_9M_SIZE
-            if self.detector_name is DetectorName.EIGER
-            else PILATUS_6M_SIZE
-        )
+        return EIGER2_X_9M_SIZE
 
 
 class LaserExperiment(BaseModel):

mx_bluesky/beamlines/i24/serial/parameters/fixed_target/cs/cs_maker.json

@@ -1,8 +1,8 @@
 {
-    "scalex": 10004.7,
-    "scaley": 10004.4,
+    "scalex": 10006.4,
+    "scaley": 10011.9,
     "scalez": 10000.0,
-    "skew": 0.120,
+    "skew": 0.025,
     "Sx_dir": 1,
     "Sy_dir": 1,
     "Sz_dir": 1

mx_bluesky/beamlines/i24/serial/run_extruder.sh

@@ -9,6 +9,21 @@ case "$2" in
         ;;
 esac
 
+# Get visit from PV and set the instrument session thet will be read by the edms
+# Hack to make the blueapi CLI happy as the client now requires an instrument session
+# on every POST request. For the command line, that means a -i $INSTRUMENT_SESSION
+visit_pv=BL24I-MO-IOC-13:GP1
+visit=$(echo "$(caget -S $visit_pv)" | awk '{print $NF}')
+session=${visit##$visit_pv}
+echo $session
+
+if [[ -z "$session" ]]; then
+    # if PV is empty print error message and exit
+    echo "The visit PV has not been set, please contact beamline staff"
+    exit 1
+fi
+
+export INSTRUMENT_SESSION=$session
 
 # Get edm path from input
 edm_path=$1

mx_bluesky/beamlines/i24/serial/run_fixed_target.sh

@@ -9,6 +9,23 @@ case "$2" in
         ;;
 esac
 
+# Get visit from PV and set the instrument session thet will be read by the edms
+# Hack to make the blueapi CLI happy as the client now requires an instrument session
+# on every POST request. For the command line, that means a -i $INSTRUMENT_SESSION
+visit_pv=BL24I-MO-IOC-13:GP100
+# visit=$(caget -S $ft_pv)
+visit=$(echo "$(caget -S $visit_pv)" | awk '{print $NF}')
+session=${visit##$visit_pv}
+echo $session
+
+if [[ -z "$session" ]]; then
+    # if PV is empty print error message and exit
+    echo "The visit PV has not been set, please contact beamline staff"
+    exit 1
+fi
+
+export INSTRUMENT_SESSION=$session
+
 # Get edm path from input
 edm_path=$1
 

mx_bluesky/beamlines/i24/serial/set_visit_directory.sh

@@ -36,7 +36,7 @@ if [[ "${visit: -1}" != "/" ]]; then
 fi
 
 ex_pv=BL24I-MO-IOC-13:GP1
-ft_pv=BL24I-MO-IOC-01:GP100
+ft_pv=BL24I-MO-IOC-13:GP100
 
 shopt -s nocasematch
 

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

@@ -1,6 +1,6 @@
 from . import pv, setup_beamline
 from .ca import caget, cagetstring, caput
-from .pv_abstract import Detector, Eiger, Pilatus
+from .pv_abstract import Detector, Eiger
 
 __all__ = [
     "caget",
@@ -8,7 +8,6 @@ __all__ = [
     "caput",
     "Detector",
     "Eiger",
-    "Pilatus",
     "pv",
     "setup_beamline",
 ]

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

@@ -25,31 +25,6 @@ def __which__():
 
 requested_transmission = "BL24I-OP-ATTN-01:T2A:SETVAL1"
 
-# PILATUS
-pilat_filepath = "BL24I-EA-PILAT-01:cam1:FilePath"
-pilat_filename = "BL24I-EA-PILAT-01:cam1:FileName"
-pilat_filetemplate = "BL24I-EA-PILAT-01:cam1:FileTemplate"
-pilat_numimages = "BL24I-EA-PILAT-01:cam1:NumImages"
-pilat_numexpimage = "BL24I-EA-PILAT-01:cam1:NumExposures"
-pilat_filenumber = "BL24I-EA-PILAT-01:cam1:FileNumber"
-pilat_acquire = "BL24I-EA-PILAT-01:cam1:Acquire"
-pilat_acquiretime = "BL24I-EA-PILAT-01:cam1:AcquireTime"
-pilat_acquireperiod = "BL24I-EA-PILAT-01:cam1:AcquirePeriod"
-pilat_imagemode = "BL24I-EA-PILAT-01:cam1:ImageMode"
-pilat_triggermode = "BL24I-EA-PILAT-01:cam1:TriggerMode"
-pilat_delaytime = "BL24I-EA-PILAT-01:cam1:DelayTime"
-pilat_wavelength = "BL24I-EA-PILAT-01:cam1:Wavelength"
-pilat_detdist = "BL24I-EA-PILAT-01:cam1:DetDist"
-pilat_filtertrasm = "BL24I-EA-PILAT-01:cam1:FilterTransm"
-pilat_filetemplate = "BL24I-EA-PILAT-01:cam1:FileTemplate"
-pilat_beamx = "BL24I-EA-PILAT-01:cam1:BeamX"
-pilat_beamy = "BL24I-EA-PILAT-01:cam1:BeamY"
-pilat_startangle = "BL24I-EA-PILAT-01:cam1:StartAngle"
-pilat_angleincr = "BL24I-EA-PILAT-01:cam1:AngleIncr"
-pilat_omegaincr = "BL24I-EA-PILAT-01:cam1:OmegaIncr"
-pilat_cbftemplate = "BL24I-EA-PILAT-01:cam1:CbfTemplateFile"
-pilat_filenum = "BL24I-EA-PILAT-01:cam1:FileNumber_RBV"
-
 
 # Eiger
 eiger_filepath = "BL24I-EA-EIGER-01:CAM:FilePath"

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

@@ -8,35 +8,6 @@ abstract wrapper around them.
 from mx_bluesky.beamlines.i24.serial.setup_beamline import pv
 
 
-class Pilatus:
-    id = 58
-    name = "pilatus"
-
-    # fast, slow / width, height
-    image_size_pixels = (2463, 2527)
-    pixel_size_mm = (0.172, 0.172)
-    image_size_mm = tuple(
-        round(a * b, 3) for a, b in zip(image_size_pixels, pixel_size_mm, strict=False)
-    )
-
-    det_y_threshold = 640.0
-    det_y_target = 647.0
-
-    class pv:
-        detector_distance = pv.pilat_detdist
-        wavelength = pv.pilat_wavelength
-        transmission = pv.pilat_filtertrasm
-        file_name = pv.pilat_filename
-        file_path = pv.pilat_filepath
-        file_template = pv.pilat_filetemplate
-        file_number = pv.pilat_filenumber
-        beamx = pv.pilat_beamx
-        beamy = pv.pilat_beamy
-
-    def __str__(self) -> str:
-        return self.name
-
-
 class Eiger:
     id = 94
     name = "eiger"
@@ -68,4 +39,4 @@ class Eiger:
         return self.name
 
 
-Detector = Pilatus | Eiger
+Detector = Eiger

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

@@ -275,100 +275,6 @@ def modechange(action):
     return 1
 
 
-def pilatus(action, args_list):
-    SSX_LOGGER.debug("***** Entering Pilatus")
-    SSX_LOGGER.info(f"Setup pilatus - {action}")
-    if args_list:
-        for arg in args_list:
-            SSX_LOGGER.debug(f"Argument: {arg}")
-
-    caput(pv.pilat_detdist, caget(pv.det_z))
-    caput(pv.pilat_filtertrasm, caget(pv.attn_match))
-
-    # Fixed Target stage (very fast start and stop w/ triggering from GeoBrick
-    if action == "fastchip":
-        [filepath, filename, total_numb_imgs, exptime] = args_list
-        rampath = filepath.replace("dls/i24/data", "ramdisk")
-        acqtime = float(exptime) - 0.001
-        SSX_LOGGER.debug(f"Filepath was set as {filepath}")
-        SSX_LOGGER.debug(f"Rampath set as {rampath}")
-        SSX_LOGGER.debug(f"Filename set as {filename}")
-        SSX_LOGGER.debug(f"total_numb_imgs {total_numb_imgs}")
-        SSX_LOGGER.debug(f"Exposure time set as {exptime} s")
-        SSX_LOGGER.debug(f"Acquire time set as {acqtime} s")
-        caput(pv.pilat_startangle, 0.0)
-        caput(pv.pilat_angleincr, 0.0)
-        caput(pv.pilat_omegaincr, 0.0)
-        caput(pv.pilat_filepath, rampath + "/")
-        caput(pv.pilat_filename, filename)
-        caput(pv.pilat_numimages, str(total_numb_imgs))
-        caput(pv.pilat_acquiretime, str(acqtime))
-        caput(pv.pilat_acquireperiod, str(exptime))
-        caput(pv.pilat_imagemode, "Single")
-        caput(pv.pilat_triggermode, "Mult. Trigger")
-        caput(pv.pilat_delaytime, 0)
-
-    # Quick set of images no coordinated motion
-    elif action == "quickshot":
-        SSX_LOGGER.debug("quickshot")
-        [filepath, filename, num_imgs, exptime] = args_list
-        rampath = filepath.replace("dls/i24/data", "ramdisk")
-        caput(pv.pilat_filepath, rampath)
-        yield from bps.sleep(0.1)
-        caput(pv.pilat_filename, filename)
-        yield from bps.sleep(0.1)
-        acqtime = float(exptime) - 0.001
-        caput(pv.pilat_acquiretime, str(acqtime))
-        caput(pv.pilat_acquireperiod, str(exptime))
-        SSX_LOGGER.debug(f"Filepath was set as {filepath}")
-        SSX_LOGGER.debug(f"Rampath set as {rampath}")
-        SSX_LOGGER.debug(f"Filename set as {filename}")
-        SSX_LOGGER.debug(f"num_imgs {num_imgs}")
-        SSX_LOGGER.debug(f"Exposure time set as {exptime} s")
-        SSX_LOGGER.debug(f"Acquire time set as {acqtime} s")
-        SSX_LOGGER.debug("Pilatus takes time apprx 2sec")
-        yield from bps.sleep(2)
-        caput(pv.pilat_delaytime, 0.00)
-        caput(pv.pilat_numimages, str(num_imgs))
-        caput(pv.pilat_imagemode, "Continuous")
-        caput(pv.pilat_triggermode, "Ext. Trigger")
-        yield from bps.sleep(0.2)
-
-    elif action == "quickshot-internaltrig":
-        SSX_LOGGER.debug("quickshot-internaltrig")
-        [filepath, filename, num_imgs, exptime] = args_list
-        rampath = filepath.replace("dls/i24/data", "ramdisk")
-        caput(pv.pilat_filepath, rampath)
-        yield from bps.sleep(0.1)
-        caput(pv.pilat_filename, filename)
-        yield from bps.sleep(0.1)
-        acqtime = float(exptime) - 0.001
-        caput(pv.pilat_acquiretime, str(acqtime))
-        caput(pv.pilat_acquireperiod, str(exptime))
-        SSX_LOGGER.debug(f"Filepath was set as {filepath}")
-        SSX_LOGGER.debug(f"Rampath set as {rampath}")
-        SSX_LOGGER.debug(f"Filename set as {filename}")
-        SSX_LOGGER.debug(f"num_imgs {num_imgs}")
-        SSX_LOGGER.debug(f"Exposure time set as {exptime} s")
-        SSX_LOGGER.debug(f"Acquire time set as {acqtime} s")
-        SSX_LOGGER.debug("Pilatus takes time apprx 2sec")
-        yield from bps.sleep(2)
-        caput(pv.pilat_delaytime, 0.00)
-        caput(pv.pilat_numimages, str(num_imgs))
-        caput(pv.pilat_imagemode, "Continuous")
-        caput(pv.pilat_triggermode, "Internal")
-        yield from bps.sleep(0.2)
-
-    # Put it all back to GDA acceptable defaults
-    elif action == "return to normal":
-        caput(pv.pilat_imagemode, "Continuous")
-        caput(pv.pilat_triggermode, "Ext. Trigger")
-        caput(pv.pilat_numexpimage, 1)
-    SSX_LOGGER.debug("***** leaving pilatus")
-    yield from bps.sleep(0.1)
-    return 0
-
-
 def eiger(action, args_list, dcm: DCM):
     SSX_LOGGER.debug("***** Entering Eiger")
     SSX_LOGGER.info(f"Setup eiger - {action}")

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

@@ -17,7 +17,6 @@ from mx_bluesky.beamlines.i24.serial.setup_beamline.ca import caget, caput
 from mx_bluesky.beamlines.i24.serial.setup_beamline.pv_abstract import (
     Detector,
     Eiger,
-    Pilatus,
 )
 
 EXPT_TYPE_DETECTOR_PVS = {
@@ -28,7 +27,6 @@ EXPT_TYPE_DETECTOR_PVS = {
 
 class DetRequest(IntEnum):
     eiger = 0
-    pilatus = 1
 
     def __str__(self) -> str:
         return self.name
@@ -45,9 +43,6 @@ def get_detector_type(detector_stage: YZStage) -> Generator[Msg, None, Detector]
     if float(det_y) < Eiger.det_y_threshold:
         SSX_LOGGER.info("Eiger detector in use.")
         return Eiger()
-    elif float(det_y) > Pilatus.det_y_threshold:
-        SSX_LOGGER.info("Pilatus detector in use.")
-        return Pilatus()
     else:
         SSX_LOGGER.error("Detector not found.")
         raise UnknownDetectorType("Detector not found.")
@@ -68,10 +63,10 @@ def _get_requested_detector(det_type_pv: str) -> str:
             a string or and int.
 
     Returns:
-        str: The detector name as a string, currently "eiger" or "pilatus".
+        str: The detector name as a string, currently "eiger".
     """
     det_type = caget(det_type_pv)
-    if det_type in ["pilatus", "eiger"]:
+    if det_type in ["eiger"]:
         return det_type
     else:
         try:
@@ -89,9 +84,8 @@ def setup_detector_stage(
     det_type_pv = EXPT_TYPE_DETECTOR_PVS[expt_type]
     requested_detector = _get_requested_detector(det_type_pv)
     SSX_LOGGER.info(f"Requested detector: {requested_detector}.")
-    det_y_target = (
-        Eiger.det_y_target if requested_detector == "eiger" else Pilatus.det_y_target
-    )
+    det_y_target = Eiger.det_y_target
+
     yield from _move_detector_stage(detector_stage, det_y_target)
     caput(det_type_pv, requested_detector)
     SSX_LOGGER.info("Detector setup done.")