mx-bluesky 1.5.11__py3-none-any.whl → 1.5.14__py3-none-any.whl

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

@@ -4,7 +4,7 @@ major 4
 minor 0
 release 1
 x 535
-y 134
+y 171
 w 500
 h 150
 font "arial-medium-r-18.0"
@@ -29,8 +29,8 @@ minor 1
 release 1
 x 20
 y 31
-w 153
-h 23
+w 146
+h 21
 font "arial-medium-r-18.0"
 fgColor index 14
 bgColor index 0
@@ -51,7 +51,7 @@ x 188
 y 17
 w 178
 h 43
-controlPv "BL24I-EA-CHIP-01:PMAC_STRING"
+controlPv "BL24I-MO-IOC-13:PMAC:console"
 fgColor index 25
 fgAlarm
 bgColor index 5
@@ -68,8 +68,8 @@ release 0
 x 188
 y 88
 w 198
-h 23
-controlPv "BL24I-EA-CHIP-01:SEND_STRING.AINP"
+h 21
+controlPv "BL24I-MO-IOC-13:PMAC:console_RBV"
 font "arial-medium-r-18.0"
 fgColor index 16
 bgColor index 14
@@ -89,8 +89,8 @@ minor 1
 release 1
 x 17
 y 86
-w 145
-h 23
+w 142
+h 21
 font "arial-medium-r-18.0"
 fgColor index 14
 bgColor index 0

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

@@ -4,7 +4,7 @@ major 4
 minor 0
 release 1
 x 830
-y 237
+y 274
 w 900
 h 700
 font "arial-medium-r-18.0"
@@ -195,7 +195,7 @@ x 155
 y 428
 w 75
 h 25
-controlPv "BL24I-EA-CHIP-01:expTime"
+controlPv "BL24I-MO-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 "BL24I-MO-IOC-01:GP104"
+controlPv "BL24I-MO-IOC-13: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 "BL24I-MO-IOC-01:GP105"
+controlPv "BL24I-MO-IOC-13: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 "BL24I-MO-IOC-01:GP106"
+controlPv "BL24I-MO-IOC-13: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 "BL24I-MO-IOC-01:GP107"
+controlPv "BL24I-MO-IOC-13: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 "BL24I-MO-IOC-01:GP108"
+controlPv "BL24I-MO-IOC-13: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 "BL24I-MO-IOC-01:GP103"
+controlPv "BL24I-MO-IOC-13: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 "BL24I-MO-IOC-01:GP109"
+controlPv "BL24I-MO-IOC-13: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 "BL24I-MO-IOC-01:GP109"
+visPv "BL24I-MO-IOC-13:GP109"
 visMin "0.00001"
 visMax "999"
 value {
@@ -1158,7 +1158,7 @@ x 144
 y 124
 w 75
 h 25
-controlPv "BL24I-MO-IOC-01:GP103"
+controlPv "BL24I-MO-IOC-13: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 "BL24I-MO-IOC-01:GP110"
+controlPv "BL24I-MO-IOC-13: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 "BL24I-MO-IOC-01:GP111"
+controlPv "BL24I-MO-IOC-13:GP111"
 font "arial-medium-r-18.0"
 numItems 2
 symbolTag {

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

@@ -257,7 +257,7 @@ def set_datasize(
         SSX_LOGGER.debug(f"Num exposures: {parameters.num_exposures}")
         SSX_LOGGER.debug(f"Block count: {len(parameters.chip_map)}")
 
-    caput(pv.me14e_gp10, parameters.total_num_images)
+    caput(pv.ioc13_gp10, parameters.total_num_images)
 
 
 @log_on_entry
@@ -331,6 +331,7 @@ def start_i24(
                 parameters.exposure_time_s,
             ],
             dcm,
+            detector_stage,
         )
 
         # DCID process depends on detector PVs being set up already
@@ -387,6 +388,7 @@ def finish_i24(
     pmac: PMAC,
     shutter: HutchShutter,
     dcm: DCM,
+    detector_stage: YZStage,
     parameters: FixedTargetParameters,
 ):
     SSX_LOGGER.info(
@@ -400,7 +402,7 @@ def finish_i24(
     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)
+        yield from sup.eiger("return-to-normal", None, dcm, detector_stage)
         complete_filename = cagetstring(pv.eiger_od_filename_rbv)  # type: ignore
     else:
         raise ValueError(f"{parameters.detector_name} unrecognised")
@@ -548,6 +550,7 @@ def tidy_up_after_collection_plan(
     pmac: PMAC,
     shutter: HutchShutter,
     dcm: DCM,
+    detector_stage: YZStage,
     parameters: FixedTargetParameters,
     dcid: DCID,
 ) -> MsgGenerator:
@@ -565,7 +568,7 @@ def tidy_up_after_collection_plan(
         caput(pv.eiger_od_capture, "Done")
         yield from bps.sleep(0.5)
 
-    yield from finish_i24(zebra, pmac, shutter, dcm, parameters)
+    yield from finish_i24(zebra, pmac, shutter, dcm, detector_stage, parameters)
 
     SSX_LOGGER.debug("Notify DCID of end of collection.")
     dcid.notify_end()
@@ -653,7 +656,7 @@ def run_plan_in_wrapper(
         except_plan=lambda e: (yield from run_aborted_plan(pmac, dcid, e)),
         final_plan=lambda: (
             yield from tidy_up_after_collection_plan(
-                zebra, pmac, shutter, dcm, parameters, dcid
+                zebra, pmac, shutter, dcm, detector_stage, parameters, dcid
             )
         ),
         auto_raise=False,

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

@@ -53,11 +53,11 @@ CHIP_MOVES = {
 }
 OXFORD_CHIP_WIDTH = 8
 PVAR_TEMPLATE = f"P3%0{2}d1"
-CHIPTYPE_PV = pv.me14e_gp1
-MAPTYPE_PV = pv.me14e_gp2
-NUM_EXPOSURES_PV = pv.me14e_gp3
-PUMP_REPEAT_PV = pv.me14e_gp4
-MAP_FILEPATH_PV = pv.me14e_gp5
+CHIPTYPE_PV = pv.ioc13_gp1
+MAPTYPE_PV = pv.ioc13_gp2
+NUM_EXPOSURES_PV = pv.ioc13_gp3
+PUMP_REPEAT_PV = pv.ioc13_gp4
+MAP_FILEPATH_PV = pv.ioc13_gp5
 
 
 @log_on_entry
@@ -70,9 +70,9 @@ def initialise_stages(
     group = "initialise_stages"
     SSX_LOGGER.info("Setting velocity, acceleration and limits for stages")
 
-    yield from bps.abs_set(pmac.x.velocity, 20, group=group)
-    yield from bps.abs_set(pmac.y.velocity, 20, group=group)
-    yield from bps.abs_set(pmac.z.velocity, 20, group=group)
+    yield from bps.abs_set(pmac.x.velocity, 15, group=group)
+    yield from bps.abs_set(pmac.y.velocity, 15, group=group)
+    yield from bps.abs_set(pmac.z.velocity, 15, group=group)
     yield from bps.abs_set(pmac.x.acceleration_time, 0.01, group=group)
     yield from bps.abs_set(pmac.y.acceleration_time, 0.01, group=group)
     yield from bps.abs_set(pmac.z.acceleration_time, 0.01, group=group)
@@ -101,7 +101,7 @@ def initialise_stages(
         if i == 100:
             # Do not clear visit PV
             continue
-        pvar = "BL24I-MO-IOC-01:GP" + str(i)
+        pvar = "BL24I-MO-IOC-13:GP" + str(i)
         caput(pvar, 0)
         sys.stdout.write(".")
         sys.stdout.flush()
@@ -112,7 +112,7 @@ def initialise_stages(
 
 def _is_checker_pattern() -> bool:
     """Read the checker pattern value and return True if selected."""
-    checks = int(caget(pv.me14e_gp111))
+    checks = int(caget(pv.ioc13_gp111))
     return bool(checks)
 
 
@@ -164,9 +164,9 @@ def read_parameters(
         "pump_repeat": pump_repeat,
         "checker_pattern": _is_checker_pattern(),
         "chip_map": chip_map,
-        "laser_dwell_s": float(caget(pv.me14e_gp103)) if pump_repeat != 0 else 0.0,
-        "laser_delay_s": float(caget(pv.me14e_gp110)) if pump_repeat != 0 else 0.0,
-        "pre_pump_exposure_s": float(caget(pv.me14e_gp109))
+        "laser_dwell_s": float(caget(pv.ioc13_gp103)) if pump_repeat != 0 else 0.0,
+        "laser_delay_s": float(caget(pv.ioc13_gp110)) if pump_repeat != 0 else 0.0,
+        "pre_pump_exposure_s": float(caget(pv.ioc13_gp109))
         if pump_repeat != 0
         else None,
     }
@@ -212,7 +212,7 @@ def define_current_chip(
     """
     Not sure what this is for:
     print 'Setting Mapping Type to Lite'
-    caput(pv.me14e_gp2, 1)
+    caput(pv.ioc13_gp2, 1)
     """
     chip_type = int(caget(CHIPTYPE_PV))
     SSX_LOGGER.info(f"Chip type:{chip_type} Chipid:{chipid}")
@@ -441,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 = "BL24I-MO-IOC-01:GP" + str(i + 10)
+        pvar = "BL24I-MO-IOC-13: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 = "BL24I-MO-IOC-01:GP" + str(i + 10)
+        pvar = "BL24I-MO-IOC-13:GP" + str(i + 10)
         caput(pvar, 1)
     SSX_LOGGER.debug("Load stock map done.")
     yield from bps.null()
@@ -513,7 +513,7 @@ def load_lite_map() -> MsgGenerator:
         block_name = entry[0]
         yesno = entry[1]
         block_num = block_dict[block_name]
-        pvar = "BL24I-MO-IOC-01:GP" + str(int(block_num) + 10)
+        pvar = "BL24I-MO-IOC-13: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()
@@ -603,7 +603,7 @@ def laser_control(laser_setting: str, pmac: PMAC = inject("pmac")) -> MsgGenerat
         yield from bps.abs_set(pmac.laser, LaserSettings.LASER_2_OFF, wait=True)
 
     elif laser_setting == "laser1burn":
-        led_burn_time = caget(pv.me14e_gp103)
+        led_burn_time = caget(pv.ioc13_gp103)
         SSX_LOGGER.info("Laser 1  on")
         SSX_LOGGER.info(f"Burn time is {led_burn_time} s")
         yield from bps.abs_set(pmac.laser, LaserSettings.LASER_1_ON, wait=True)
@@ -612,7 +612,7 @@ def laser_control(laser_setting: str, pmac: PMAC = inject("pmac")) -> MsgGenerat
         yield from bps.abs_set(pmac.laser, LaserSettings.LASER_1_OFF, wait=True)
 
     elif laser_setting == "laser2burn":
-        led_burn_time = caget(pv.me14e_gp109)
+        led_burn_time = caget(pv.ioc13_gp109)
         SSX_LOGGER.info("Laser 2 on")
         SSX_LOGGER.info(f"burntime {led_burn_time} s")
         yield from bps.abs_set(pmac.laser, LaserSettings.LASER_2_ON, wait=True)
@@ -806,9 +806,9 @@ def cs_maker(pmac: PMAC = inject("pmac")) -> MsgGenerator:
     new_x2factor = (x2factor * cod_d) + (y2factor * sin_d)
     new_y2factor = (x2factor * sin_d) + (y2factor * cod_d)
 
-    cs1 = f"#1->{new_x1factor:+1.3f}X{new_y1factor:+1.3f}Y{z1factor:+1.3f}Z"
-    cs2 = f"#2->{new_x2factor:+1.3f}X{new_y2factor:+1.3f}Y{z2factor:+1.3f}Z"
-    cs3 = f"#3->{x3factor:+1.3f}X{y3factor:+1.3f}Y{z3factor:+1.3f}Z"
+    cs1 = f"#5->{new_x1factor:+1.3f}X{new_y1factor:+1.3f}Y{z1factor:+1.3f}Z"
+    cs2 = f"#6->{new_x2factor:+1.3f}X{new_y2factor:+1.3f}Y{z2factor:+1.3f}Z"
+    cs3 = f"#7->{x3factor:+1.3f}X{y3factor:+1.3f}Y{z3factor:+1.3f}Z"
     SSX_LOGGER.info(f"PMAC strings. \ncs1: {cs1} \ncs2: {cs2}cs3: {cs3}")
     SSX_LOGGER.info(
         """These next values should be 1.
@@ -825,14 +825,17 @@ def cs_maker(pmac: PMAC = inject("pmac")) -> MsgGenerator:
     yield from bps.trigger(pmac.to_xyz_zero)
     yield from bps.sleep(2.5)
     yield from bps.trigger(pmac.home, wait=True)
+    yield from bps.trigger(pmac.abort_program, wait=True)
     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, f"{CS_STR}!x0.4y0.4", wait=True)
         yield from bps.sleep(2.5)
         yield from bps.trigger(pmac.home, wait=True)
+        yield from bps.trigger(pmac.abort_program, wait=True)
     else:
         yield from bps.trigger(pmac.home, wait=True)
+        yield from bps.trigger(pmac.abort_program, wait=True)
     SSX_LOGGER.debug("CSmaker done.")
     yield from bps.null()
 
@@ -875,7 +878,7 @@ def pumpprobe_calc() -> MsgGenerator:
     # TODO See https://github.com/DiamondLightSource/mx_bluesky/issues/122
     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))
+    pumpexptime = float(caget(pv.ioc13_gp103))
     movetime = 0.014
     SSX_LOGGER.info(f"X-ray exposure time {exptime}")
     SSX_LOGGER.info(f"Laser dwell time {pumpexptime}")
@@ -885,11 +888,11 @@ def pumpprobe_calc() -> MsgGenerator:
     repeat5 = 10 * 20 * (movetime + (pumpexptime + exptime) / 2)
     repeat10 = 20 * 20 * (movetime + (pumpexptime + exptime) / 2)
     for pv_name, repeat in (
-        (pv.me14e_gp104, repeat1),
-        (pv.me14e_gp105, repeat2),
-        (pv.me14e_gp106, repeat3),
-        (pv.me14e_gp107, repeat5),
-        (pv.me14e_gp108, repeat10),
+        (pv.ioc13_gp104, repeat1),
+        (pv.ioc13_gp105, repeat2),
+        (pv.ioc13_gp106, repeat3),
+        (pv.ioc13_gp107, repeat5),
+        (pv.ioc13_gp108, repeat10),
     ):
         rounded = round(repeat, 4)
         caput(pv_name, rounded)
@@ -901,9 +904,9 @@ def pumpprobe_calc() -> MsgGenerator:
 @log_on_entry
 def block_check(pmac: PMAC = inject("pmac")) -> MsgGenerator:
     # TODO See https://github.com/DiamondLightSource/mx_bluesky/issues/117
-    caput(pv.me14e_gp9, 0)
+    caput(pv.ioc13_gp9, 0)
     while True:
-        if int(caget(pv.me14e_gp9)) == 0:
+        if int(caget(pv.ioc13_gp9)) == 0:
             chip_type = int(caget(CHIPTYPE_PV))
             if chip_type == ChipType.Minichip:
                 SSX_LOGGER.info("Oxford mini chip in use.")
@@ -918,7 +921,7 @@ def block_check(pmac: PMAC = inject("pmac")) -> MsgGenerator:
                 SSX_LOGGER.warning("Default is Oxford chip block start list.")
                 block_start_list = scrape_pvar_file("oxford.pvar")
             for entry in block_start_list:
-                if int(caget(pv.me14e_gp9)) != 0:
+                if int(caget(pv.ioc13_gp9)) != 0:
                     SSX_LOGGER.warning("Block Check Aborted")
                     yield from bps.sleep(1.0)
                     break
@@ -927,7 +930,7 @@ def block_check(pmac: PMAC = inject("pmac")) -> MsgGenerator:
                 yield from bps.abs_set(
                     pmac.pmac_string, f"{CS_STR}!x{x}y{y}", wait=True
                 )
-                yield from bps.sleep(0.4)
+                yield from bps.sleep(0.5)
         else:
             SSX_LOGGER.warning("Block Check Aborted due to GP 9 not equalling 0")
             break

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"BL24I-MO-IOC-01:GP{i}" for i in range(11, 75)]
+OXFORD_BLOCKS_PVS = [f"BL24I-MO-IOC-13:GP{i}" for i in range(11, 75)]
 
 
 class EmptyMapError(Exception):
@@ -54,10 +54,10 @@ def get_chip_format(
             defaults["b2b_horz"] = defaults["b2b_vert"] = 0.0
         case ChipType.Custom:
             if origin == "edm":
-                defaults["x_num_steps"] = int(caget(pv.me14e_gp6))
-                defaults["y_num_steps"] = int(caget(pv.me14e_gp7))
-                defaults["x_step_size"] = float(caget(pv.me14e_gp8))
-                defaults["y_step_size"] = float(caget(pv.me14e_gp99))
+                defaults["x_num_steps"] = int(caget(pv.ioc13_gp6))
+                defaults["y_num_steps"] = int(caget(pv.ioc13_gp7))
+                defaults["x_step_size"] = float(caget(pv.ioc13_gp8))
+                defaults["y_step_size"] = float(caget(pv.ioc13_gp99))
             else:
                 # NOTE Test for WEB GUI
                 if not format: