mx-bluesky 1.5.10__py3-none-any.whl → 1.5.12__py3-none-any.whl

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

@@ -13,7 +13,7 @@ from dodal.devices.i24.pmac import PMAC
 from dodal.devices.oav.oav_detector import OAV
 
 from mx_bluesky.beamlines.i24.serial.fixed_target import (
-    i24ssx_Chip_Manager_py3v1 as manager,
+    i24ssx_chip_manager_py3v1 as manager,
 )
 from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import Fiducials
 from mx_bluesky.beamlines.i24.serial.log import SSX_LOGGER
@@ -52,12 +52,12 @@ def _move_on_mouse_click_plan(
         position coordinates.
     """
     zoomcalibrator = yield from _calculate_zoom_calibrator(oav)
-    beamX, beamY = yield from _get_beam_centre(oav)
+    beam_x, beam_y = yield from _get_beam_centre(oav)
     x, y = clicked_position
-    xmove = -10 * (beamX - x) * zoomcalibrator
-    ymove = 10 * (beamY - y) * zoomcalibrator
+    xmove = -10 * (beam_x - x) * zoomcalibrator
+    ymove = 10 * (beam_y - y) * zoomcalibrator
     SSX_LOGGER.info(f"Zoom calibrator {zoomcalibrator}")
-    SSX_LOGGER.info(f"Beam centre {beamX} {beamY}")
+    SSX_LOGGER.info(f"Beam centre {beam_x} {beam_y}")
     SSX_LOGGER.info(f"Moving X and Y {xmove} {ymove}")
     xmovepmacstring = "&2#5J:" + str(xmove)
     ymovepmacstring = "&2#6J:" + str(ymove)
@@ -66,22 +66,22 @@ def _move_on_mouse_click_plan(
 
 
 # Register clicks and move chip stages
-def onMouse(event, x, y, flags, param):
+def on_mouse(event, x, y, flags, param):
     if event == cv.EVENT_LBUTTONUP:
-        RE = param[0]
+        run_engine = param[0]
         pmac = param[1]
         oav = param[2]
         SSX_LOGGER.info(f"Clicked X and Y {x} {y}")
-        RE(_move_on_mouse_click_plan(oav, pmac, (x, y)))
+        run_engine(_move_on_mouse_click_plan(oav, pmac, (x, y)))
 
 
-def update_ui(oav, frame, RE):
+def update_ui(oav, frame, run_engine):
     # Get beam x and y values
-    beamX, beamY = RE(_get_beam_centre(oav)).plan_result
+    beam_x, beam_y = run_engine(_get_beam_centre(oav)).plan_result
 
     # Overlay text and beam centre
     cv.ellipse(
-        frame, (beamX, beamY), (12, 8), 0.0, 0.0, 360, (0, 255, 255), thickness=2
+        frame, (beam_x, beam_y), (12, 8), 0.0, 0.0, 360, (0, 255, 255), thickness=2
     )
     cv.putText(
         frame,
@@ -156,13 +156,13 @@ def update_ui(oav, frame, RE):
     cv.imshow("OAV1view", frame)
 
 
-def start_viewer(oav: OAV, pmac: PMAC, RE: RunEngine, oav1: str = OAV1_CAM):
-    # Create a video caputure from OAV1
+def start_viewer(oav: OAV, pmac: PMAC, run_engine: RunEngine, oav1: str = OAV1_CAM):
+    # Create a video capture from OAV1
     cap = cv.VideoCapture(oav1)
 
     # Create window named OAV1view and set onmouse to this
     cv.namedWindow("OAV1view")
-    cv.setMouseCallback("OAV1view", onMouse, param=[RE, pmac, oav])  # type: ignore
+    cv.setMouseCallback("OAV1view", on_mouse, param=[run_engine, pmac, oav])  # type: ignore
 
     SSX_LOGGER.info("Showing camera feed. Press escape to close")
     # Read captured video and store them in success and frame
@@ -172,44 +172,44 @@ def start_viewer(oav: OAV, pmac: PMAC, RE: RunEngine, oav1: str = OAV1_CAM):
     while success:
         success, frame = cap.read()
 
-        update_ui(oav, frame, RE)
+        update_ui(oav, frame, run_engine)
 
         k = cv.waitKey(1)
         if k == 113:  # Q
-            RE(manager.moveto(Fiducials.zero, pmac))
+            run_engine(manager.moveto(Fiducials.zero, pmac))
         if k == 119:  # W
-            RE(manager.moveto(Fiducials.fid1, pmac))
+            run_engine(manager.moveto(Fiducials.fid1, pmac))
         if k == 101:  # E
-            RE(manager.moveto(Fiducials.fid2, pmac))
+            run_engine(manager.moveto(Fiducials.fid2, pmac))
         if k == 97:  # A
-            RE(bps.trigger(pmac.home, wait=True))
+            run_engine(bps.trigger(pmac.home, wait=True))
             print("Current position set as origin")
         if k == 115:  # S
-            RE(manager.fiducial(1))
+            run_engine(manager.fiducial(1))
         if k == 100:  # D
-            RE(manager.fiducial(2))
+            run_engine(manager.fiducial(2))
         if k == 99:  # C
-            RE(manager.cs_maker(pmac))
+            run_engine(manager.cs_maker(pmac))
         if k == 98:  # B
-            RE(
+            run_engine(
                 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, "&2#6J:-10", wait=True))
+            run_engine(bps.abs_set(pmac.pmac_string, "&2#6J:-10", wait=True))
         if k == 110:  # N
-            RE(bps.abs_set(pmac.pmac_string, "&2#6J:10", wait=True))
+            run_engine(bps.abs_set(pmac.pmac_string, "&2#6J:10", wait=True))
         if k == 109:  # M
-            RE(bps.abs_set(pmac.pmac_string, "&2#5J:-10", wait=True))
+            run_engine(bps.abs_set(pmac.pmac_string, "&2#5J:-10", wait=True))
         if k == 98:  # B
-            RE(bps.abs_set(pmac.pmac_string, "&2#5J:10", wait=True))
+            run_engine(bps.abs_set(pmac.pmac_string, "&2#5J:10", wait=True))
         if k == 105:  # I
-            RE(bps.abs_set(pmac.pmac_string, "&2#7J:-150", wait=True))
+            run_engine(bps.abs_set(pmac.pmac_string, "&2#7J:-150", wait=True))
         if k == 111:  # O
-            RE(bps.abs_set(pmac.pmac_string, "&2#7J:150", wait=True))
+            run_engine(bps.abs_set(pmac.pmac_string, "&2#7J:150", wait=True))
         if k == 117:  # U
-            RE(bps.abs_set(pmac.pmac_string, "&2#7J:-1000", wait=True))
+            run_engine(bps.abs_set(pmac.pmac_string, "&2#7J:-1000", wait=True))
         if k == 112:  # P
-            RE(bps.abs_set(pmac.pmac_string, "&2#7J:1000", wait=True))
+            run_engine(bps.abs_set(pmac.pmac_string, "&2#7J:1000", wait=True))
         if k == 0x1B:  # esc
             cv.destroyWindow("OAV1view")
             print("Pressed escape. Closing window")
@@ -220,8 +220,8 @@ def start_viewer(oav: OAV, pmac: PMAC, RE: RunEngine, oav1: str = OAV1_CAM):
 
 
 if __name__ == "__main__":
-    RE = RunEngine(call_returns_result=True)
+    run_engine = RunEngine(call_returns_result=True)
     # Get devices out of dodal
     oav: OAV = i24.oav(connect_immediately=True)
     pmac: PMAC = i24.pmac(connect_immediately=True)
-    start_viewer(oav, pmac, RE)
+    start_viewer(oav, pmac, run_engine)

mx_bluesky/beamlines/i24/serial/log.py

@@ -9,7 +9,7 @@ import bluesky.plan_stubs as bps
 from bluesky.log import logger as bluesky_logger
 from bluesky.utils import MsgGenerator
 from dodal.log import DEFAULT_GRAYLOG_PORT, ophyd_async_logger
-from dodal.log import LOGGER as dodal_logger
+from dodal.log import LOGGER as DODAL_LOGGER
 
 from mx_bluesky.common.utils.log import do_default_logging_setup
 
@@ -19,7 +19,7 @@ VISIT_PATH = Path("/dls_sw/i24/etc/ssx_current_visit.txt")
 # Logging set up
 SSX_LOGGER = logging.getLogger("I24serial")
 SSX_LOGGER.addHandler(logging.NullHandler())
-SSX_LOGGER.parent = dodal_logger
+SSX_LOGGER.parent = DODAL_LOGGER
 
 
 logging_config = {
@@ -101,14 +101,14 @@ def config(
     """
     if logfile:
         logs = _get_logging_file_path() / logfile
-        fileFormatter = logging.Formatter(
+        file_formatter = logging.Formatter(
             "%(asctime)s %(levelname)s: \t(%(name)s) %(message)s",
             datefmt="%d-%m-%Y %I:%M:%S",
         )
-        FH = logging.FileHandler(logs, mode=write_mode, encoding="utf-8", delay=delayed)
-        FH.setLevel(logging.DEBUG)
-        FH.setFormatter(fileFormatter)
-        SSX_LOGGER.addHandler(FH)
+        fh = logging.FileHandler(logs, mode=write_mode, encoding="utf-8", delay=delayed)
+        fh.setLevel(logging.DEBUG)
+        fh.setFormatter(file_formatter)
+        SSX_LOGGER.addHandler(fh)
     do_default_logging_setup(
         "mx-bluesky.log",
         DEFAULT_GRAYLOG_PORT,
@@ -116,8 +116,8 @@ def config(
         integrate_all_logs=False,
     )
     # Remove dodal StreamHandler to avoid duplication of messages above debug
-    dodal_logger.removeHandler(dodal_logger.handlers[0])
-    _integrate_bluesky_logs(dodal_logger)
+    DODAL_LOGGER.removeHandler(DODAL_LOGGER.handlers[0])
+    _integrate_bluesky_logs(DODAL_LOGGER)
 
 
 def log_on_entry(func):
@@ -151,6 +151,6 @@ def clean_up_log_config_at_end() -> MsgGenerator:
     # See https://github.com/DiamondLightSource/mx-bluesky/issues/609
     for handler in SSX_LOGGER.handlers:
         SSX_LOGGER.removeHandler(handler)
-    for handler in dodal_logger.handlers:
-        dodal_logger.removeHandler(handler)
+    for handler in DODAL_LOGGER.handlers:
+        DODAL_LOGGER.removeHandler(handler)
     yield from bps.null()

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

@@ -3,7 +3,7 @@
     "scaley": 10011.9,
     "scalez": 10000.0,
     "skew": 0.025,
-    "Sx_dir": 1,
-    "Sy_dir": 1,
-    "Sz_dir": 1
+    "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"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:

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

@@ -38,15 +38,3 @@ def caput(pv, new_val):
     else:
         a = Popen(["caput", pv, str(new_val)], stdout=PIPE, stderr=PIPE)
         a_stdout, a_stderr = a.communicate()
-
-
-def evaluate(val):
-    try:
-        int(val)
-        return int(val)
-    except Exception:
-        try:
-            float(val)
-            return float(val)
-        except ValueError:
-            return val