mx-bluesky 0.0.1__tar.gz → 0.0.2__tar.gz

{mx_bluesky-0.0.1 → mx_bluesky-0.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mx_bluesky
-Version: 0.0.1
+Version: 0.0.2
 Summary: Bluesky tools for MX Beamlines
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License
@@ -221,8 +221,9 @@ Requires-Dist: jupyterlab
 Requires-Dist: matplotlib
 Requires-Dist: requests
 Requires-Dist: opencv-python
-Requires-Dist: dls-dodal==1.8.0
+Requires-Dist: dls-dodal==1.9.0
 Provides-Extra: dev
+Requires-Dist: GitPython; extra == "dev"
 Requires-Dist: black; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: pipdeptree; extra == "dev"
@@ -256,7 +257,11 @@ Getting Started
 
 To get started with developing this repo at DLS run ```dls_dev_setup.sh``.
 
-We recommend developing with VSCode. You can do this at DLS by running::
+If you want to develop interactively at the beamline we recommend using jupyter notebooks. You can get started with this by running::
+
+    $ ./start_jupyter.sh
+
+If you're doing more in-depth development we recommend developing with VSCode. You can do this at DLS by running::
 
 
     $ module load vscode

{mx_bluesky-0.0.1 → mx_bluesky-0.0.2}/README.rst

@@ -17,7 +17,11 @@ Getting Started
 
 To get started with developing this repo at DLS run ```dls_dev_setup.sh``.
 
-We recommend developing with VSCode. You can do this at DLS by running::
+If you want to develop interactively at the beamline we recommend using jupyter notebooks. You can get started with this by running::
+
+    $ ./start_jupyter.sh
+
+If you're doing more in-depth development we recommend developing with VSCode. You can do this at DLS by running::
 
 
     $ module load vscode

mx_bluesky-0.0.2/deploy/deploy_mxbluesky.py

@@ -0,0 +1,190 @@
+"""
+Deploy latest release of mx_bluesky either on a beamline or in dev mode.
+"""
+
+import argparse
+import os
+from subprocess import PIPE, CalledProcessError, Popen
+from typing import List, Tuple
+
+from git import Repo
+from packaging.version import Version
+
+recognised_beamlines = ["i24"]
+
+help_message = """
+To deploy mx_bluesky on a specific beamline, pass only the --beamline argument.
+This will put the latest release in /dls_sw/ixx/software/bluesky/mx_bluesky_v#.#.# and \
+set the permissions accordingly. \n
+To run in dev mode instead, only the --dev-path should be passed, a test release will \
+be placed in {dev_path}/mxbluesky_release_test/bluesky. \n
+Finally, if both a --beamline and a --dev-path are specified, a beamline-specific test \
+deployment will be put in the test directory.
+"""
+
+
+class repo:
+    # Set name, setup remote origin, get the latest version"""
+    def __init__(self, name: str, repo_args):
+        self.name = name
+        self.repo = Repo(repo_args)
+
+        self.origin = self.repo.remotes.origin
+        self.origin.fetch()
+
+        self.versions = [t.name for t in self.repo.tags]
+        self.versions.sort(key=Version, reverse=True)
+        print(f"Found {self.name}_versions:\n{os.linesep.join(self.versions)}")
+        self.latest_version_str = self.versions[0]
+
+    def deploy(self, url, beamline: str = None):
+        print(f"Cloning latest version {self.name} into {self.deploy_location}")
+
+        deploy_repo = Repo.init(self.deploy_location)
+        deploy_origin = deploy_repo.create_remote("origin", self.origin.url)
+
+        deploy_origin.fetch()
+        deploy_repo.git.checkout(self.latest_version_str)
+
+        print("Setting permissions")
+        groups_to_give_permission = get_permission_groups(beamline)
+        setfacl_params = ",".join(
+            [f"g:{group}:rwx" for group in groups_to_give_permission]
+        )
+
+        # Set permissions and defaults
+        os.system(f"setfacl -R -m {setfacl_params} {self.deploy_location}")
+        os.system(f"setfacl -dR -m {setfacl_params} {self.deploy_location}")
+
+    # Deploy location depends on the latest mx_bluesky version (...software/bluesky/mx_bluesky_V...)
+    def set_deploy_location(self, release_area):
+        self.deploy_location = os.path.join(release_area, self.name)
+        if os.path.isdir(self.deploy_location):
+            raise Exception(
+                f"{self.deploy_location} already exists, stopping deployment for {self.name}"
+            )
+
+
+# Get permission groups depending on beamline/dev install
+def get_permission_groups(beamline: str = None) -> List:
+    beamline_groups = ["gda2", "dls_dasc"]
+    if beamline:
+        beamline_groups.append(f"{beamline}_staff")
+    return beamline_groups
+
+
+# Get the release directory based off the beamline and the latest mx_bluesky version
+def get_beamline_and_release_dir_from_args(repo: repo) -> Tuple[str, str]:
+    if repo.name != "mx_bluesky":
+        raise ValueError("This function should only be used with the mx_bluesky repo")
+
+    parser = argparse.ArgumentParser(
+        formatter_class=argparse.RawTextHelpFormatter,
+        description=__doc__,
+        epilog=help_message,
+    )
+    parser.add_argument(
+        "--beamline",
+        type=str,
+        choices=recognised_beamlines,
+        help="The beamline to deploy mx-bluesky to.",
+    )
+    parser.add_argument(
+        "--dev-path",
+        type=str,
+        help="Path for dev deployment.",
+    )
+
+    args = parser.parse_args()
+    if not args.beamline:
+        print("Running as dev")
+        if not args.dev_path:
+            raise ValueError("The path for the dev install hasn't been specified.")
+        return None, os.path.join(args.dev_path, "mxbluesky_release_test/bluesky")
+    elif args.beamline and args.dev_path:
+        print(
+            f"""
+            WARNING! Running a {args.beamline} deployment as dev, which will be placed
+            in {args.dev_path}.
+            """
+        )
+        return args.beamline, os.path.join(
+            args.dev_path, f"mxbluesky_{args.beamline}_release_test/bluesky"
+        )
+    else:
+        print(f"Deploying on beamline {args.beamline}.")
+        return args.beamline, f"/dls_sw/{args.beamline}/software/bluesky"
+
+
+def run_process_and_print_output(proc_to_run):
+    with Popen(proc_to_run, stdout=PIPE, bufsize=1, universal_newlines=True) as p:
+        if p.stdout is not None:
+            for line in p.stdout:
+                print(line, end="")
+    if p.returncode != 0:
+        raise CalledProcessError(p.returncode, p.args)
+
+
+if __name__ == "__main__":
+    mx_repo = repo(
+        name="mx_bluesky",
+        repo_args=os.path.join(os.path.dirname(__file__), "../.git"),
+    )
+
+    # Gives path to /bluesky
+    beamline, release_area = get_beamline_and_release_dir_from_args(mx_repo)
+
+    release_area_version = os.path.join(
+        release_area, f"mx_bluesky_{mx_repo.latest_version_str}"
+    )
+
+    print(f"Putting releases into {release_area_version}")
+
+    dodal_repo = repo(
+        name="dodal",
+        repo_args=os.path.join(os.path.dirname(__file__), "../../dodal/.git"),
+    )
+
+    dodal_repo.set_deploy_location(release_area_version)
+    mx_repo.set_deploy_location(release_area_version)
+
+    # Deploy mx_bluesky repo
+    mx_repo.deploy(mx_repo.origin.url, beamline)
+
+    # Get version of dodal that latest mx_bluesky version uses
+    with open(f"{release_area_version}/mx_bluesky/pyproject.toml", "r") as setup_file:
+        dodal_url = [
+            line
+            for line in setup_file
+            if "https://github.com/DiamondLightSource/python-dodal" in line
+        ]
+
+    # Now deploy the correct version of dodal
+    dodal_repo.deploy(dodal_url, beamline)
+
+    # Set up environment and run /dls_dev_env.sh...
+    os.chdir(mx_repo.deploy_location)
+    print(f"Setting up environment in {mx_repo.deploy_location}")
+
+    if mx_repo.name == "mx_bluesky":
+        run_process_and_print_output("./dls_dev_setup.sh")
+
+    # If on beamline I24 also deploy the screens to run ssx collections
+    if beamline == "i24":
+        print("Setting up edm screens for serial collections on I24.")
+        run_process_and_print_output("./deploy/deploy_edm_for_ssx.sh")
+
+    move_symlink = input(
+        """Move symlink (y/n)? WARNING: this will affect the running version!
+Only do so if you have informed the beamline scientist and you're sure mx_bluesky is not running.
+"""
+    )
+    # Creates symlink: software/bluesky/mx_bluesky_version -> software/bluesky/mx_bluesky
+    if move_symlink == "y":
+        live_location = os.path.join(release_area, "mx_bluesky")
+        new_tmp_location = os.path.join(release_area, "tmp_art")
+        os.symlink(mx_repo.deploy_location, new_tmp_location)
+        os.rename(new_tmp_location, live_location)
+        print(f"New version moved to {live_location}")
+    else:
+        print("Quiting without latest version being updated")

{mx_bluesky-0.0.1 → mx_bluesky-0.0.2}/dls_dev_setup.sh

@@ -1,3 +1,9 @@
+#!/bin/bash
+
+# controls_dev sets pip up to look at a local pypi server, which is incomplete
+module unload controls_dev
+
+
 module load python/3.10
 
 if [ -d "./.venv" ]

{mx_bluesky-0.0.1 → mx_bluesky-0.0.2}/pyproject.toml

@@ -20,7 +20,7 @@ dependencies = [
     "matplotlib",
     "requests",
     "opencv-python",
-    "dls-dodal==1.8.0",
+    "dls-dodal==1.9.0",
 ]
 dynamic = ["version"]
 license.file = "LICENSE"
@@ -29,6 +29,7 @@ requires-python = ">=3.9"
 
 [project.optional-dependencies]
 dev = [
+    "GitPython",
     "black",
     "mypy",
     "pipdeptree",

{mx_bluesky-0.0.1 → mx_bluesky-0.0.2}/src/mx_bluesky/I24/serial/fixed_target/FT-gui-edm/pumpprobe-py3v1.edl

@@ -3,8 +3,8 @@ beginScreenProperties
 major 4
 minor 0
 release 1
-x 1570
-y 705
+x 3174
+y 381
 w 900
 h 700
 font "arial-medium-r-18.0"
@@ -1559,3 +1559,54 @@ value {
 autoSize
 endObjectProperties
 
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 6
+y 275
+w 191
+h 27
+font "arial-bold-r-24.0"
+fgColor index 12
+bgColor index 0
+useDisplayBg
+value {
+  "Checker Pattern"
+}
+autoSize
+endObjectProperties
+
+# (Menu Mux)
+object menuMuxClass
+beginObjectProperties
+major 4
+minor 1
+release 0
+x 207
+y 276
+w 82
+h 24
+fgColor index 14
+bgColor index 3
+topShadowColor index 1
+botShadowColor index 8
+controlPv "ME14E-MO-IOC-01:GP111"
+font "arial-medium-r-18.0"
+numItems 2
+symbolTag {
+  0 "False"
+  1 "True"
+}
+symbol0 {
+  0 "NN"
+  1 "ML"
+}
+value0 {
+  0 "none"
+  1 "True"
+}
+endObjectProperties
+

{mx_bluesky-0.0.1 → mx_bluesky-0.0.2}/src/mx_bluesky/I24/serial/fixed_target/i24ssx_Chip_Collect_py3v1.py

@@ -11,8 +11,11 @@ import time
 from datetime import datetime
 from pathlib import Path
 from time import sleep
+from typing import Dict, List
 
 import numpy as np
+from dodal.beamlines import i24
+from dodal.devices.i24.pmac import PMAC
 
 from mx_bluesky.I24.serial import log
 from mx_bluesky.I24.serial.dcid import DCID
@@ -164,7 +167,9 @@ def get_chip_prog_values(
 
 
 @log.log_on_entry
-def load_motion_program_data(motion_program_dict, map_type, pump_repeat):
+def load_motion_program_data(
+    pmac: PMAC, motion_program_dict: Dict[str, List], map_type: int, pump_repeat: int
+):
     logger.info("Loading motion program data for chip.")
     logger.info("Pump_repeat is %s" % pump_repeat)
     if pump_repeat == PumpProbeSetting.NoPP:
@@ -184,6 +189,10 @@ def load_motion_program_data(motion_program_dict, map_type, pump_repeat):
         # Pump setting chosen
         prefix = 14
         logger.info("Setting program prefix to %s" % prefix)
+        pmac.pmac_string.set("P1439=0")
+        if bool(caget(pv.me14e_gp111)) is True:
+            logger.info("Checker pattern setting enabled.")
+            pmac.pmac_string.set("P1439=1")
     else:
         logger.warning("Unknown Pump repeat, pump_repeat = %s" % pump_repeat)
         return
@@ -196,7 +205,7 @@ def load_motion_program_data(motion_program_dict, map_type, pump_repeat):
         value = str(v[1])
         s = "P%s=%s" % (str(pvar), str(value))
         logger.info("%s \t %s" % (key, s))
-        caput(pv.me14e_pmac_str, s)
+        pmac.pmac_string.set(s)
         sleep(0.02)
     sleep(0.2)
 
@@ -537,6 +546,8 @@ def finish_i24(chip_prog_dict, start_time):
 
 
 def main():
+    # Dodal devices
+    pmac = i24.pmac()
     # ABORT BUTTON
     logger.info("Running a chip collection on I24")
     caput(pv.me14e_gp9, 0)
@@ -587,7 +598,7 @@ def main():
         n_exposures=n_exposures,
     )
     logger.info("Loading Motion Program Data")
-    load_motion_program_data(chip_prog_dict, map_type, pump_repeat)
+    load_motion_program_data(pmac, chip_prog_dict, map_type, pump_repeat)
 
     start_time, dcid = start_i24()
 

{mx_bluesky-0.0.1 → mx_bluesky-0.0.2}/src/mx_bluesky/I24/serial/fixed_target/i24ssx_Chip_Manager_py3v1.py

@@ -128,6 +128,8 @@ def write_parameter_file(param_path: Path | str = PARAM_FILE_PATH_FT):
     chip_type = caget(pv.me14e_gp1)
     det_type = get_detector_type()
 
+    checkerpattern = bool(caget(pv.me14e_gp111))
+
     # If file name ends in a digit this causes processing/pilatus pain.
     # Append an underscore
     if det_type == "pilatus":
@@ -158,19 +160,21 @@ def write_parameter_file(param_path: Path | str = PARAM_FILE_PATH_FT):
         f.write("exptime \t%s\n" % exptime)
         f.write("dcdetdist \t%s\n" % dcdetdist)
         f.write("det_type \t%s\n" % str(det_type))
+        f.write("checkerpattern \t%s\n" % str(checkerpattern))
 
     logger.info("Information written to file")
-    logger.info("visit: %s" % visit)
-    logger.info("filename: %s" % chip_name)
-    logger.info("protein_name: %s" % protein_name)
-    logger.info("n_exposures: %s" % n_exposures)
-    logger.info("chip_type: %s" % chip_type)
-    logger.info("map_type: %s" % map_type)
-    logger.info("pump_repeat: %s" % pump_repeat)
-    logger.info("pumpexptime: %s" % pumpexptime)
-    logger.info("pumpdelay: %s" % pumpdelay)
-    logger.info("prepumpexptime: %s" % prepumpexptime)
-    logger.info("detector type: %s" % str(det_type))
+    logger.info(f"visit: {visit}")
+    logger.info(f"filename: {chip_name}")
+    logger.info(f"protein_name: {protein_name}")
+    logger.info(f"n_exposures: {n_exposures}")
+    logger.info(f"chip_type: {chip_type}")
+    logger.info(f"map_type: {map_type}")
+    logger.info(f"pump_repeat: {pump_repeat}")
+    logger.info(f"pumpexptime: {pumpexptime}")
+    logger.info(f"pumpdelay: {pumpdelay}")
+    logger.info(f"prepumpexptime: {prepumpexptime}")
+    logger.info(f"detector type: {str(det_type)}")
+    logger.info(f"checker pattern: {checkerpattern}")
     if map_type == MappingType.Full:
         # This step creates some header files (.addr, .spec), containing the parameters,
         # that are only needed when full mapping is in use.

{mx_bluesky-0.0.1 → mx_bluesky-0.0.2}/src/mx_bluesky/I24/serial/fixed_target/i24ssx_moveonclick.py

@@ -10,7 +10,6 @@ from dodal.devices.oav.oav_detector import OAV
 
 from mx_bluesky.I24.serial.fixed_target import i24ssx_Chip_Manager_py3v1 as manager
 from mx_bluesky.I24.serial.parameters.constants import OAV1_CAM
-from mx_bluesky.I24.serial.setup_beamline import caput, pv
 
 logger = logging.getLogger("I24ssx.moveonclick")
 
@@ -25,12 +24,7 @@ def _get_beam_centre(oav: OAV):
     Args:
         oav (OAV): the OAV device.
     """
-    beamX, beamY = oav.parameters.beam_centre_i, oav.parameters.beam_centre_j
-    # Re-scale beam position to an image of 1024x768 to get the correct values
-    # See https://github.com/DiamondLightSource/dodal/issues/249
-    beamX *= 1292 / 1024
-    beamY *= 964 / 768
-    return int(beamX), int(beamY)
+    return oav.parameters.beam_centre_i, oav.parameters.beam_centre_j
 
 
 # TODO In the future, this should be done automatically in the OAV device
@@ -45,6 +39,7 @@ def get_beam_centre():
 
 # Register clicks and move chip stages
 def onMouse(event, x, y, flags, param):
+    pmac = param
     beamX, beamY = get_beam_centre()
     if event == cv.EVENT_LBUTTONUP:
         logger.info("Clicked X and Y %s %s" % (x, y))
@@ -53,8 +48,8 @@ def onMouse(event, x, y, flags, param):
         logger.info("Moving X and Y %s %s" % (xmove, ymove))
         xmovepmacstring = "#1J:" + str(xmove)
         ymovepmacstring = "#2J:" + str(ymove)
-        caput(pv.me14e_pmac_str, xmovepmacstring)
-        caput(pv.me14e_pmac_str, ymovepmacstring)
+        pmac.pmac_string.set(xmovepmacstring)
+        pmac.pmac_string.set(ymovepmacstring)
 
 
 def update_ui(frame):
@@ -140,12 +135,14 @@ def update_ui(frame):
 
 
 def start_viewer(oav1: str = OAV1_CAM):
+    # Get PMAC device
+    pmac = i24.pmac()
     # Create a video caputure from OAV1
     cap = cv.VideoCapture(oav1)
 
     # Create window named OAV1view and set onmouse to this
     cv.namedWindow("OAV1view")
-    cv.setMouseCallback("OAV1view", onMouse)  # type: ignore
+    cv.setMouseCallback("OAV1view", onMouse, param=pmac)  # type: ignore
 
     logger.info("Showing camera feed. Press escape to close")
     # Read captured video and store them in success and frame
@@ -165,7 +162,7 @@ def start_viewer(oav1: str = OAV1_CAM):
         if k == 101:  # E
             manager.moveto("f2")
         if k == 97:  # A
-            caput(pv.me14e_pmac_str, r"\#1hmz\#2hmz\#3hmz")
+            pmac.pmac_string.set(r"\#1hmz\#2hmz\#3hmz")
             print("Current position set as origin")
         if k == 115:  # S
             manager.fiducial(1)
@@ -176,21 +173,21 @@ def start_viewer(oav1: str = OAV1_CAM):
         if k == 98:  # B
             manager.block_check()  # doesn't work well for blockcheck as image doesn't update
         if k == 104:  # H
-            caput(pv.me14e_pmac_str, "#2J:-10")
+            pmac.pmac_string.set("#2J:-10")
         if k == 110:  # N
-            caput(pv.me14e_pmac_str, "#2J:10")
+            pmac.pmac_string.set("#2J:10")
         if k == 109:  # M
-            caput(pv.me14e_pmac_str, "#1J:-10")
+            pmac.pmac_string.set("#1J:-10")
         if k == 98:  # B
-            caput(pv.me14e_pmac_str, "#1J:10")
+            pmac.pmac_string.set("#1J:10")
         if k == 105:  # I
-            caput(pv.me14e_pmac_str, "#3J:-150")
+            pmac.pmac_string.set("#3J:-150")
         if k == 111:  # O
-            caput(pv.me14e_pmac_str, "#3J:150")
+            pmac.pmac_string.set("#3J:150")
         if k == 117:  # U
-            caput(pv.me14e_pmac_str, "#3J:-1000")
+            pmac.pmac_string.set("#3J:-1000")
         if k == 112:  # P
-            caput(pv.me14e_pmac_str, "#3J:1000")
+            pmac.pmac_string.set("#3J:1000")
         if k == 0x1B:  # esc
             cv.destroyWindow("OAV1view")
             print("Pressed escape. Closing window")

{mx_bluesky-0.0.1 → mx_bluesky-0.0.2}/src/mx_bluesky/_version.py

@@ -1,4 +1,4 @@
 # file generated by setuptools_scm
 # don't change, don't track in version control
-__version__ = version = '0.0.1'
-__version_tuple__ = version_tuple = (0, 0, 1)
+__version__ = version = '0.0.2'
+__version_tuple__ = version_tuple = (0, 0, 2)

{mx_bluesky-0.0.1 → mx_bluesky-0.0.2}/src/mx_bluesky.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mx-bluesky
-Version: 0.0.1
+Version: 0.0.2
 Summary: Bluesky tools for MX Beamlines
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License
@@ -221,8 +221,9 @@ Requires-Dist: jupyterlab
 Requires-Dist: matplotlib
 Requires-Dist: requests
 Requires-Dist: opencv-python
-Requires-Dist: dls-dodal==1.8.0
+Requires-Dist: dls-dodal==1.9.0
 Provides-Extra: dev
+Requires-Dist: GitPython; extra == "dev"
 Requires-Dist: black; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: pipdeptree; extra == "dev"
@@ -256,7 +257,11 @@ Getting Started
 
 To get started with developing this repo at DLS run ```dls_dev_setup.sh``.
 
-We recommend developing with VSCode. You can do this at DLS by running::
+If you want to develop interactively at the beamline we recommend using jupyter notebooks. You can get started with this by running::
+
+    $ ./start_jupyter.sh
+
+If you're doing more in-depth development we recommend developing with VSCode. You can do this at DLS by running::
 
 
     $ module load vscode

{mx_bluesky-0.0.1 → mx_bluesky-0.0.2}/src/mx_bluesky.egg-info/SOURCES.txt

@@ -22,6 +22,7 @@ start_jupyter.sh
 .vscode/settings.json
 .vscode/tasks.json
 deploy/deploy_edm_for_ssx.sh
+deploy/deploy_mxbluesky.py
 docs/conf.py
 docs/genindex.rst
 docs/index.rst

{mx_bluesky-0.0.1 → mx_bluesky-0.0.2}/src/mx_bluesky.egg-info/requires.txt

@@ -5,9 +5,10 @@ jupyterlab
 matplotlib
 requests
 opencv-python
-dls-dodal==1.8.0
+dls-dodal==1.9.0
 
 [dev]
+GitPython
 black
 mypy
 pipdeptree

mx_bluesky-0.0.2/start_jupyter.sh

@@ -0,0 +1,2 @@
+source .venv/bin/activate
+jupyter-lab --matplotlib=qt5 ./src/mx_bluesky/jupyter_example.ipynb

{mx_bluesky-0.0.1 → mx_bluesky-0.0.2}/tests/I24/serial/fixed_target/test_ft_collect.py

@@ -1,4 +1,4 @@
-from unittest.mock import mock_open, patch
+from unittest.mock import MagicMock, call, mock_open, patch
 
 import pytest
 
@@ -6,6 +6,7 @@ from mx_bluesky.I24.serial.fixed_target.i24ssx_Chip_Collect_py3v1 import (
     datasetsizei24,
     get_chip_prog_values,
     get_prog_num,
+    load_motion_program_data,
     start_i24,
 )
 
@@ -79,6 +80,38 @@ def test_get_prog_number(chip_type, map_type, pump_repeat, expected_prog):
     assert get_prog_num(chip_type, map_type, pump_repeat) == expected_prog
 
 
+@pytest.mark.parametrize(
+    "map_type, pump_repeat, checker, expected_calls",
+    [
+        (0, 0, False, ["P1100=1"]),  # Full chip, no pump probe, no checker
+        (1, 0, False, ["P1200=1"]),  # Mapping lite, no pp, no checker
+        (
+            1,
+            2,
+            False,
+            ["P1439=0", "P1400=1"],
+        ),  # Map irrelevant, pp to Repeat1, no checker
+        (
+            0,
+            3,
+            True,
+            ["P1439=0", "P1439=1", "P1400=1"],
+        ),  # Map irrelevant, pp to Repeat2, checker enabled
+    ],
+)
+@patch("mx_bluesky.I24.serial.fixed_target.i24ssx_Chip_Collect_py3v1.i24.pmac")
+@patch("mx_bluesky.I24.serial.fixed_target.i24ssx_Chip_Collect_py3v1.caget")
+def test_load_motion_program_data_(
+    fake_caget, fake_pmac, map_type, pump_repeat, checker, expected_calls
+):
+    test_dict = {"N_EXPOSURES": [0, 1]}
+    fake_caget.return_value = checker
+    fake_pmac.pmac_string = MagicMock()
+    load_motion_program_data(fake_pmac, test_dict, map_type, pump_repeat)
+    call_list = [call.set(i) for i in expected_calls]
+    fake_pmac.pmac_string.assert_has_calls(call_list)
+
+
 @patch("mx_bluesky.I24.serial.fixed_target.i24ssx_Chip_Collect_py3v1.datasetsizei24")
 @patch("mx_bluesky.I24.serial.fixed_target.i24ssx_Chip_Collect_py3v1.DCID")
 @patch("mx_bluesky.I24.serial.fixed_target.i24ssx_Chip_Collect_py3v1.caput")

{mx_bluesky-0.0.1 → mx_bluesky-0.0.2}/tests/I24/serial/fixed_target/test_moveonclick.py

@@ -18,22 +18,22 @@ from mx_bluesky.I24.serial.fixed_target.i24ssx_moveonclick import (
         ((638, 392), "#1J:-3828", "#2J:-2352"),
     ],
 )
-@patch("mx_bluesky.I24.serial.fixed_target.i24ssx_moveonclick.caput")
+@patch("mx_bluesky.I24.serial.fixed_target.i24ssx_moveonclick.i24.pmac")
 @patch("mx_bluesky.I24.serial.fixed_target.i24ssx_moveonclick.get_beam_centre")
 def test_onMouse_gets_beam_position_and_sends_correct_str(
     fake_get_beam_pos,
-    fake_caput,
+    fake_pmac,
     beam_position,
     expected_1J,
     expected_2J,
 ):
     fake_get_beam_pos.side_effect = [beam_position]
-    onMouse(cv.EVENT_LBUTTONUP, 0, 0, "", "")
-    assert fake_caput.call_count == 2
-    fake_caput.assert_has_calls(
+    fake_pmac.pmac_string = MagicMock()
+    onMouse(cv.EVENT_LBUTTONUP, 0, 0, "", param=fake_pmac)
+    fake_pmac.pmac_string.assert_has_calls(
         [
-            call(ANY, expected_1J),
-            call(ANY, expected_2J),
+            call.set(expected_1J),
+            call.set(expected_2J),
         ]
     )
 

mx_bluesky-0.0.1/start_jupyter.sh

@@ -1,2 +0,0 @@
-source .venv/bin/activate
-jupyter-lab --matplotlib=qt5