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

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
@@ -16,7 +15,7 @@ from dodal.common import inject
 from dodal.devices.attenuator.attenuator import ReadOnlyAttenuator
 from dodal.devices.i24.beamstop import Beamstop, BeamstopPositions
 from dodal.devices.i24.dual_backlight import BacklightPositions, DualBacklight
-from dodal.devices.i24.pmac import PMAC, EncReset, LaserSettings
+from dodal.devices.i24.pmac import CS_STR, PMAC, EncReset, LaserSettings
 from dodal.devices.motors import YZStage
 
 from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import (
@@ -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,15 +95,13 @@ 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):
         if i == 100:
             # Do not clear visit PV
             continue
-        pvar = "ME14E-MO-IOC-01:GP" + str(i)
+        pvar = "BL24I-MO-IOC-01:GP" + str(i)
         caput(pvar, 0)
         sys.stdout.write(".")
         sys.stdout.flush()
@@ -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 = {
@@ -457,14 +441,14 @@ def load_stock_map(map_choice: str = "clear") -> MsgGenerator:
 
     SSX_LOGGER.info("Clearing GP 10-74")  # Actually 11-44
     for i in range(1, 65):
-        pvar = "ME14E-MO-IOC-01:GP" + str(i + 10)
+        pvar = "BL24I-MO-IOC-01:GP" + str(i + 10)
         caput(pvar, 0)
         sys.stdout.write(".")
         sys.stdout.flush()
     SSX_LOGGER.info("Map cleared")
     SSX_LOGGER.info(f"Loading Map Choice {map_choice}")
     for i in map_dict[map_choice]:
-        pvar = "ME14E-MO-IOC-01:GP" + str(i + 10)
+        pvar = "BL24I-MO-IOC-01:GP" + str(i + 10)
         caput(pvar, 1)
     SSX_LOGGER.debug("Load stock map done.")
     yield from bps.null()
@@ -529,7 +513,7 @@ def load_lite_map() -> MsgGenerator:
         block_name = entry[0]
         yesno = entry[1]
         block_num = block_dict[block_name]
-        pvar = "ME14E-MO-IOC-01:GP" + str(int(block_num) + 10)
+        pvar = "BL24I-MO-IOC-01:GP" + str(int(block_num) + 10)
         SSX_LOGGER.info(f"Block: {block_name} \tScanned: {yesno} \tPVAR: {pvar}")
     SSX_LOGGER.debug("Load lite map done")
     yield from bps.null()
@@ -604,7 +588,6 @@ def laser_control(laser_setting: str, pmac: PMAC = inject("pmac")) -> MsgGenerat
         SSX_LOGGER.info("Laser 1 /BNC2 shutter is open")
         # Use M712 = 0 if triggering on falling edge. M712 =1 if on rising edge
         # Be sure to also change laser1off
-        # caput(pv.me14e_pmac_str, ' M712=0 M711=1')
         yield from bps.abs_set(pmac.laser, LaserSettings.LASER_1_ON, wait=True)
 
     elif laser_setting == "laser1off":
@@ -845,7 +828,7 @@ def cs_maker(pmac: PMAC = inject("pmac")) -> MsgGenerator:
     yield from bps.sleep(2.5)
     SSX_LOGGER.debug(f"Chip_type is {chip_type}")
     if chip_type == 0:
-        yield from bps.abs_set(pmac.pmac_string, "!x0.4y0.4", wait=True)
+        yield from bps.abs_set(pmac.pmac_string, f"{CS_STR}!x0.4y0.4", wait=True)
         yield from bps.sleep(2.5)
         yield from bps.trigger(pmac.home, wait=True)
     else:
@@ -856,9 +839,9 @@ def cs_maker(pmac: PMAC = inject("pmac")) -> MsgGenerator:
 
 def cs_reset(pmac: PMAC = inject("pmac")) -> MsgGenerator:
     """Used to clear CS when using Custom Chip"""
-    cs1 = "#1->10000X+0Y+0Z"
-    cs2 = "#2->+0X-10000Y+0Z"
-    cs3 = "#3->0X+0Y-10000Z"
+    cs1 = "#5->10000X+0Y+0Z"
+    cs2 = "#6->+0X-10000Y+0Z"
+    cs3 = "#7->0X+0Y-10000Z"
     strg = "\n".join([cs1, cs2, cs3])
     print(strg)
     yield from set_pmac_strings_for_cs(pmac, {"cs1": cs1, "cs2": cs2, "cs3": cs3})
@@ -881,7 +864,7 @@ def set_pmac_strings_for_cs(pmac: PMAC, cs_str: dict):
 
     Note. On the PMAC the axes allocations are: #1 - X, #2 - Y, #3 - Z.
     """
-    yield from bps.abs_set(pmac.pmac_string, "&2", wait=True)
+    yield from bps.abs_set(pmac.pmac_string, CS_STR, wait=True)
     yield from bps.abs_set(pmac.pmac_string, cs_str["cs1"], wait=True)
     yield from bps.abs_set(pmac.pmac_string, cs_str["cs2"], wait=True)
     yield from bps.abs_set(pmac.pmac_string, cs_str["cs3"], wait=True)
@@ -893,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)
@@ -941,7 +924,9 @@ def block_check(pmac: PMAC = inject("pmac")) -> MsgGenerator:
                     break
                 block, x, y = entry
                 SSX_LOGGER.debug(f"Block: {block} -> (x={x} y={y})")
-                yield from bps.abs_set(pmac.pmac_string, f"!x{x}y{y}", wait=True)
+                yield from bps.abs_set(
+                    pmac.pmac_string, f"{CS_STR}!x{x}y{y}", wait=True
+                )
                 yield from bps.sleep(0.4)
         else:
             SSX_LOGGER.warning("Block Check Aborted due to GP 9 not equalling 0")

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

@@ -59,8 +59,8 @@ def _move_on_mouse_click_plan(
     SSX_LOGGER.info(f"Zoom calibrator {zoomcalibrator}")
     SSX_LOGGER.info(f"Beam centre {beamX} {beamY}")
     SSX_LOGGER.info(f"Moving X and Y {xmove} {ymove}")
-    xmovepmacstring = "#1J:" + str(xmove)
-    ymovepmacstring = "#2J:" + str(ymove)
+    xmovepmacstring = "&2#5J:" + str(xmove)
+    ymovepmacstring = "&2#6J:" + str(ymove)
     yield from bps.abs_set(pmac.pmac_string, xmovepmacstring, wait=True)
     yield from bps.abs_set(pmac.pmac_string, ymovepmacstring, wait=True)
 
@@ -195,21 +195,21 @@ def start_viewer(oav: OAV, pmac: PMAC, RE: RunEngine, oav1: str = OAV1_CAM):
                 manager.block_check()
             )  # doesn't work well for blockcheck as image doesn't update
         if k == 104:  # H
-            RE(bps.abs_set(pmac.pmac_string, "#2J:-10", wait=True))
+            RE(bps.abs_set(pmac.pmac_string, "&2#6J:-10", wait=True))
         if k == 110:  # N
-            RE(bps.abs_set(pmac.pmac_string, "#2J:10", wait=True))
+            RE(bps.abs_set(pmac.pmac_string, "&2#6J:10", wait=True))
         if k == 109:  # M
-            RE(bps.abs_set(pmac.pmac_string, "#1J:-10", wait=True))
+            RE(bps.abs_set(pmac.pmac_string, "&2#5J:-10", wait=True))
         if k == 98:  # B
-            RE(bps.abs_set(pmac.pmac_string, "#1J:10", wait=True))
+            RE(bps.abs_set(pmac.pmac_string, "&2#5J:10", wait=True))
         if k == 105:  # I
-            RE(bps.abs_set(pmac.pmac_string, "#3J:-150", wait=True))
+            RE(bps.abs_set(pmac.pmac_string, "&2#7J:-150", wait=True))
         if k == 111:  # O
-            RE(bps.abs_set(pmac.pmac_string, "#3J:150", wait=True))
+            RE(bps.abs_set(pmac.pmac_string, "&2#7J:150", wait=True))
         if k == 117:  # U
-            RE(bps.abs_set(pmac.pmac_string, "#3J:-1000", wait=True))
+            RE(bps.abs_set(pmac.pmac_string, "&2#7J:-1000", wait=True))
         if k == 112:  # P
-            RE(bps.abs_set(pmac.pmac_string, "#3J:1000", wait=True))
+            RE(bps.abs_set(pmac.pmac_string, "&2#7J:1000", wait=True))
         if k == 0x1B:  # esc
             cv.destroyWindow("OAV1view")
             print("Pressed escape. Closing window")

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/parameters/utils.py

@@ -7,7 +7,7 @@ from mx_bluesky.beamlines.i24.serial.parameters.experiment_parameters import (
 )
 from mx_bluesky.beamlines.i24.serial.setup_beamline import caget, pv
 
-OXFORD_BLOCKS_PVS = [f"ME14E-MO-IOC-01:GP{i}" for i in range(11, 75)]
+OXFORD_BLOCKS_PVS = [f"BL24I-MO-IOC-01:GP{i}" for i in range(11, 75)]
 
 
 class EmptyMapError(Exception):

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=ME14E-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",
 ]