mx-bluesky 1.5.2__py3-none-any.whl → 1.5.4__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

@@ -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
@@ -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
@@ -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
@@ -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_Manager_py3v1.py

@@ -16,7 +16,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 (
@@ -104,7 +104,7 @@ def initialise_stages(
         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()
@@ -457,14 +457,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 +529,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 +604,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 +844,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 +855,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 +880,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)
@@ -941,7 +940,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/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/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-01:GP100
 
 shopt -s nocasematch