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

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

@@ -4,7 +4,6 @@ This version in python3 new Feb2021 by RLO
     - March 21 added logging and Eiger functionality
 """
 
-import re
 import sys
 import time
 from datetime import datetime
@@ -23,13 +22,11 @@ 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.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.log import (
@@ -40,9 +37,13 @@ from mx_bluesky.beamlines.i24.serial.log import (
 from mx_bluesky.beamlines.i24.serial.parameters import ExtruderParameters
 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 (
+    caget,
+    cagetstring,
+    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 (
     UnknownDetectorType,
@@ -89,7 +90,6 @@ def initialise_extruder(
     caput(pv.ioc13_gp9, 0)
     caput(pv.ioc13_gp10, 0)
     caput(pv.ioc13_gp15, det_type.name)
-    caput(pv.pilat_cbftemplate, 0)
     SSX_LOGGER.info("Initialisation complete.")
     yield from bps.null()
 
@@ -109,19 +109,11 @@ def laser_check(
     resets the shutter mode to manual.
 
     WARNING. When using the laser with the extruder, some hardware changes need to be made.
-    Because all four of the zebra ttl outputs are in use in this mode, when the \
-    detector in use is the Eiger, the Pilatus cable is repurposed to trigger the light \
-    source, and viceversa.
+    The cable previously used by Pilatus is repurposed to trigger the light source
     """
     SSX_LOGGER.debug(f"Laser check: {mode}")
 
-    det_type = yield from get_detector_type(detector_stage)
-
-    LASER_TTL = (
-        zebra.mapping.outputs.TTL_EIGER
-        if isinstance(det_type, Pilatus)
-        else zebra.mapping.outputs.TTL_PILATUS
-    )
+    LASER_TTL = zebra.mapping.outputs.TTL_PILATUS  # Update with dodal changes
 
     if mode == "laseron":
         yield from bps.abs_set(
@@ -164,17 +156,6 @@ def read_parameters(detector_stage: YZStage, attenuator: ReadOnlyAttenuator):
     det_type = yield from get_detector_type(detector_stage)
     SSX_LOGGER.warning(f"DETECTOR TYPE: {det_type}")
     filename = caget(pv.ioc13_gp3)
-    # If file name ends in a digit this causes processing/pilatus pain.
-    # Append an underscore
-    if det_type.name == "pilatus":
-        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.info(
-                f"Requested filename ends in a number. Appended dash: {filename}"
-            )
 
     transmission = yield from bps.rd(attenuator.actual_transmission)
 
@@ -216,7 +197,6 @@ 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],
@@ -245,57 +225,7 @@ def main_extruder_plan(
     SSX_LOGGER.debug(f"Filepath {filepath}")
     SSX_LOGGER.debug(f"Filename {parameters.filename}")
 
-    if parameters.detector_name == "pilatus":
-        SSX_LOGGER.info("Using pilatus mini cbf")
-        caput(pv.pilat_cbftemplate, 0)
-        SSX_LOGGER.info(f"Pilatus quickshot setup: filepath {filepath}")
-        SSX_LOGGER.info(f"Pilatus quickshot setup: filepath {parameters.filename}")
-        SSX_LOGGER.info(
-            f"Pilatus quickshot setup: number of images {parameters.num_images}"
-        )
-        SSX_LOGGER.info(
-            f"Pilatus quickshot setup: exposure time {parameters.exposure_time_s}"
-        )
-
-        if parameters.pump_status:
-            SSX_LOGGER.info("Pump probe extruder data collection")
-            SSX_LOGGER.info(f"Pump exposure time {parameters.laser_dwell_s}")
-            SSX_LOGGER.info(f"Pump delay time {parameters.laser_delay_s}")
-            yield from sup.pilatus(
-                "fastchip",
-                [
-                    filepath,
-                    parameters.filename,
-                    parameters.num_images,
-                    parameters.exposure_time_s,
-                ],
-            )
-            yield from setup_zebra_for_extruder_with_pump_probe_plan(
-                zebra,
-                parameters.detector_name,
-                parameters.exposure_time_s,
-                parameters.num_images,
-                parameters.laser_dwell_s,
-                parameters.laser_delay_s,
-                pulse1_delay=0.0,
-                wait=True,
-            )
-        else:
-            SSX_LOGGER.info("Static experiment: no photoexcitation")
-            yield from sup.pilatus(
-                "quickshot",
-                [
-                    filepath,
-                    parameters.filename,
-                    parameters.num_images,
-                    parameters.exposure_time_s,
-                ],
-            )
-            yield from setup_zebra_for_quickshot_plan(
-                zebra, parameters.exposure_time_s, parameters.num_images, wait=True
-            )
-
-    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}.")
@@ -359,12 +289,10 @@ def main_extruder_plan(
     )
 
     # Do DCID creation BEFORE arming the detector
+    filetemplate = f"{parameters.filename}.nxs"
     if parameters.detector_name == "eiger":
-        filetemplate = f"{parameters.filename}.nxs"
-    else:
-        filetemplate = yield from get_pilatus_filename_template_from_device(
-            pilatus_metadata
-        )
+        complete_filename = cagetstring(pv.eiger_ODfilenameRBV)
+        filetemplate = f"{complete_filename}.nxs"
     dcid.generate_dcid(
         beam_settings=beam_settings,
         image_dir=parameters.collection_directory.as_posix(),
@@ -377,10 +305,7 @@ def main_extruder_plan(
     # Collect
     SSX_LOGGER.info("Fast shutter opening")
     yield from open_fast_shutter(zebra)
-    if parameters.detector_name == "pilatus":
-        SSX_LOGGER.info("Pilatus acquire ON")
-        caput(pv.pilat_acquire, 1)
-    elif parameters.detector_name == "eiger":
+    if parameters.detector_name == "eiger":
         SSX_LOGGER.info("Triggering Eiger NOW")
         caput(pv.eiger_trigger, 1)
 
@@ -390,7 +315,7 @@ def main_extruder_plan(
         SSX_LOGGER.debug("Call nexgen server for nexus writing.")
         beam_x = yield from bps.rd(beam_center_device.beam_x)
         beam_y = yield from bps.rd(beam_center_device.beam_y)
-        call_nexgen(
+        yield from call_nexgen(
             None,
             parameters,
             beam_settings.wavelength_in_a,
@@ -435,9 +360,7 @@ def collection_aborted_plan(
     """A plan to run in case the collection is aborted before the end."""
     SSX_LOGGER.warning("Data Collection Aborted")
     yield from disarm_zebra(zebra)  # If aborted/timed out zebra still armed
-    if detector_name == "pilatus":
-        caput(pv.pilat_acquire, 0)
-    elif detector_name == "eiger":
+    if detector_name == "eiger":
         caput(pv.eiger_acquire, 0)
     yield from bps.sleep(0.5)
     end_time = datetime.now()
@@ -462,9 +385,7 @@ def tidy_up_at_collection_end_plan(
     yield from reset_zebra_when_collection_done_plan(zebra)
 
     # Clean Up
-    if parameters.detector_name == "pilatus":
-        yield from sup.pilatus("return-to-normal", None)
-    elif parameters.detector_name == "eiger":
+    if parameters.detector_name == "eiger":
         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")
@@ -478,10 +399,7 @@ def tidy_up_at_collection_end_plan(
 def collection_complete_plan(
     collection_directory: Path, detector_name: str, dcid: DCID
 ) -> MsgGenerator:
-    if detector_name == "pilatus":
-        SSX_LOGGER.info("Pilatus Acquire STOP")
-        caput(pv.pilat_acquire, 0)
-    elif detector_name == "eiger":
+    if detector_name == "eiger":
         SSX_LOGGER.info("Eiger Acquire STOP")
         caput(pv.eiger_acquire, 0)
         caput(pv.eiger_ODcapture, "Done")
@@ -506,8 +424,6 @@ def run_extruder_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:
     start_time = datetime.now()
     SSX_LOGGER.info(f"Collection start time: {start_time.ctime()}")
@@ -518,11 +434,7 @@ def run_extruder_plan(
     # Create collection directory
     parameters.collection_directory.mkdir(parents=True, exist_ok=True)
 
-    beam_center_device = (
-        beam_center_eiger
-        if parameters.detector_name is DetectorName.EIGER
-        else beam_center_pilatus
-    )
+    beam_center_device = beam_center_eiger
 
     # DCID - not generated yet
     dcid = DCID(emit_errors=False, expt_params=parameters)
@@ -541,7 +453,6 @@ 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)

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
 
@@ -690,7 +690,7 @@ botShadowColor index 11
 font "arial-medium-r-18.0"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run cs_reset '\{\"pmac\":\"pmac\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run -i $INSTRUMENT_SESSION cs_reset '\{\"pmac\":\"pmac\"\}'"
 }
 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,20 +78,17 @@ 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 {
   0 "Eiger"
-  1 "Pilatus"
 }
 symbol0 {
   0 "E9M"
-  1 "P6M"
 }
 PV0 {
   0 "eiger"
-  1 "pilatus"
 }
 endObjectProperties
 
@@ -113,7 +110,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\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run -i $INSTRUMENT_SESSION setup_detector_stage '\{\"expt_type\":\"Serial Fixed\"\}'"
 }
 endObjectProperties