mx-bluesky 1.4.6__tar.gz → 1.4.7__tar.gz

mx_bluesky-1.4.7/.github/CODEOWNERS

@@ -0,0 +1 @@
+* @DiamondLightSource/developers-mx-daq

{mx_bluesky-1.4.6 → mx_bluesky-1.4.7}/.github/CONTRIBUTING.md

@@ -17,6 +17,23 @@ Contributions and issues are most welcome! All issues and pull requests are hand
 
 **Work should not be done without an associated ticket describing what the work is**
 
+## Developing mx-bluesky and dodal
+
+Some issues will span the mx-bluesky repo and the dodal repo. When working on both at the same time, follow these instructions:
+1. An issue is created for the work, inside mx-bluesky. This issue should describe in as much detail as possible the work that needs to be done. Anyone is free to make a ticket and/or comment on one.
+2. If a developer is going to do the work they assign themselves to the issue.
+3. The developer makes a new branch in mx-bluesky with the format `issue_short_description` e.g. `122_create_a_contributing_file`. The developer also creates a new branch in dodal, with the format `mx_bluesky_issue_short_description` - the same as the mx-bluesky branch name but with `mx_bluesky_` in front. (External developers are also welcome to make forks)
+4. The developer does the work on these branches, adding their work in small commits. Commit messages should be informative and prefixed with the issue number e.g. `(#122) Added contributing file`.
+5. Once the developer has done the final commit in both repos, they find the latest commit SHA in the dodal repo using `git log`. In `mx-bluesky/pyproject.toml`, the developer changes `dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@{dodal_commmit_SHA}` using the SHA they just found.
+6. The developer commits and pushes this final change on mx-bluesky.
+7. The developer submits a dodal PR for the work they have done in the dodal repo. The pull request should start with `Fixes #issue_num` e.g. `Fixes #122`, and should link to the issue created in mx-bluesky. The developer should also add some background on how the reviewer might test the change.
+8. The developer submits a mx-bluesky PR for the work they have done in the mx-bluesky repo. The pull request should start with `Fixes #issue_num` e.g. `Fixes #122`. This PR should link to the dodal PR just created with something like "Also needs #456". Again, the developer should add some background on how the reviewer might test the change.
+9. If the developer has a particular person in mind to review the work they should assign that person to the PRs as a reviewer.
+10. The reviewer and developer go back and forth on the code until the reviewer approves it. (See "Reviewing Work" below)
+11. Once the work is approved on both PRs, the original developer merges them. The PRs should be merged at the same time.
+
+**Work should not be done without an associated ticket describing what the work is**
+
 ## Reviewing Work
 
 **Work must be reviewed by another developer before it can be merged**. Remember that work is reviewed for a number of reasons:

{mx_bluesky-1.4.6 → mx_bluesky-1.4.7}/.gitignore

@@ -12,6 +12,7 @@ env/
 # Output
 *.png
 !docs/*.png
+!tests/test_data/**/*.png
 
 # Distribution / packaging
 .Python

{mx_bluesky-1.4.6 → mx_bluesky-1.4.7}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: mx-bluesky
-Version: 1.4.6
+Version: 1.4.7
 Summary: Bluesky tools for MX Beamlines at DLS
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License
@@ -215,7 +215,6 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: annotated_types
 Requires-Dist: caproto
-Requires-Dist: confluent-kafka==2.8.0
 Requires-Dist: fastapi[all]
 Requires-Dist: flask-restful
 Requires-Dist: ispyb
@@ -239,8 +238,8 @@ Requires-Dist: blueapi>=0.5.0
 Requires-Dist: daq-config-server>=0.1.1
 Requires-Dist: ophyd==1.9.0
 Requires-Dist: ophyd-async>=0.9.0a2
-Requires-Dist: bluesky>=1.13
-Requires-Dist: dls-dodal==1.41.0
+Requires-Dist: bluesky>=1.13.1
+Requires-Dist: dls-dodal==1.44.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: build; extra == "dev"
@@ -254,7 +253,7 @@ Requires-Dist: pipdeptree; extra == "dev"
 Requires-Dist: plantweb; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pydata-sphinx-theme>=0.12; extra == "dev"
-Requires-Dist: pyright==1.1.394; extra == "dev"
+Requires-Dist: pyright; extra == "dev"
 Requires-Dist: pytest-asyncio; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: pytest-random-order; extra == "dev"
@@ -267,6 +266,7 @@ Requires-Dist: tox-direct; extra == "dev"
 Requires-Dist: tox; extra == "dev"
 Requires-Dist: types-mock; extra == "dev"
 Requires-Dist: types-requests; extra == "dev"
+Dynamic: license-file
 
 mx-bluesky
 ===========================
@@ -285,7 +285,7 @@ Releases       https://github.com/DiamondLightSource/mx-bluesky/releases
 Getting Started
 ===============
 
-To get started with developing this repo at DLS run ``dls_dev_setup.sh``.
+To get started with developing this repo at DLS run ``./utility_scripts/dls_dev_env.sh``.
 
 If you want to develop interactively at the beamline we recommend using jupyter notebooks. You can get started with this by running::
 

{mx_bluesky-1.4.6 → mx_bluesky-1.4.7}/README.rst

@@ -15,7 +15,7 @@ Releases       https://github.com/DiamondLightSource/mx-bluesky/releases
 Getting Started
 ===============
 
-To get started with developing this repo at DLS run ``dls_dev_setup.sh``.
+To get started with developing this repo at DLS run ``./utility_scripts/dls_dev_env.sh``.
 
 If you want to develop interactively at the beamline we recommend using jupyter notebooks. You can get started with this by running::
 

mx_bluesky-1.4.7/docs/developer/general/explanations/callback_and_run_logic.rst

@@ -0,0 +1,27 @@
+Callbacks and Run Logic
+========================
+
+Callbacks are used to trigger external services:
+
+- Ispyb deposition
+- Nexus writing
+- Zocalo triggering
+
+These are linked in that to trigger zocalo you need to have made an ispyb deposition, written a nexus file and have finished writing raw data to disk. Nexus files and ispyb depositions can be made at anytime, we do not need to have necessarily finished writing raw data. 
+
+Currently, the requirement of needing to have written to ispyb is explicit as the ispyb callback will emit to the zocalo callback. The nexus file is written when the hardware is read during a collection and so its ordering is implied. When instantiated the zocalo callback is told on which plan to trigger and it is up to the plan developer to make sure this plan finishes after data is written to the detector.
+
+In general, the ordering flow of when callbacks are triggered is controlled by emitting documents with the expected plan name and data.
+
+Rotation Scans
+---------------------
+
+There are currently two ways of doing rotation scans. A single scan creates one hdf file, one ispyb deposition and then triggers zocalo once. Multi rotation scans create one hdf file for all rotations but then N nexus files, N ispyb depositions and triggers zocalo N times.
+
+Single scans will be removed in https://github.com/DiamondLightSource/mx-bluesky/issues/847
+
+For multi rotations this is does by starting 1+2*N different runs:
+
+1. ``CONST.PLAN.ROTATION_MULTI``: This is emitted once for the whole multiple rotation. It is used by the nexus callback to get the full number of images and meta_data_run_number so that it knows which hdf file to use. When this is finished zocalo end is triggered.
+2. ``CONST.PLAN.ROTATION_OUTER``: Emitted N times, inside a ``CONST.PLAN.ROTATION_MULTI`` run. This is used to create the initial ispyb deposition and create the nexus writer (but not actually write the file)
+3. ``CONST.PLAN.ROTATION_MAIN``: Emitted N times, inside ``CONST.PLAN.ROTATION_OUTER`` run. Used to finish writing to ispyb (i.e. write success/failure) and to send collection information to zocalo.

{mx_bluesky-1.4.6 → mx_bluesky-1.4.7}/docs/developer/general/how-to/get-started.rst

@@ -4,8 +4,8 @@ Get Started with mx-bluesky
 Development Environment
 =======================
 
-- Clone this repo: ``git@github.com:DiamondLightSource/mx-bluesky.git``
-- To install a ``dev`` environment run ``./dls_dev_setup.sh``. Note that this will also clone and install a local version of ``dodal``, as the ``mx-bluesky`` package makes use of the devices instantiated there. 
+- Clone this repo using SSH: ``git clone git@github.com:DiamondLightSource/mx-bluesky.git``
+- To install a ``dev`` environment, from the top level ``mx-bluesky`` directory, run ``./utility_scripts/dls_dev_env.sh``. Note that this will also clone and install a local version of ``dodal``, as the ``mx-bluesky`` package makes use of the devices instantiated there. 
 
 The recommended IDE is vscode, and a workspace which includes dodal has been set up in the repo. This can be used on a DLS machine as follows:
 

{mx_bluesky-1.4.6 → mx_bluesky-1.4.7}/docs/developer/general/index.rst

@@ -41,6 +41,7 @@ Documentation is split into four categories, and each is also accessible from li
             :maxdepth: 1
 
             explanations/decisions
+            explanations/callback_and_run_logic
 
         +++
 

mx_bluesky-1.4.7/docs/developer/hyperion/how-to/update-panda-ioc.rst

@@ -0,0 +1,44 @@
+Update the PandA IOC
+=====================
+
+The IOC for the PandA can sometimes get out of sync with the production version of Ophyd-Async. Here is how to update it
+
+Check if the IOC needs updating
+""""""""""""""""""""""""""""""""
+
+- Check the minimum panda IOC version required in the version of ophyd-async used in Hyperion's release version. This can be found in the ``MINIMUM_PANDA_IOC`` constant in `_hdf_panda.py <https://github.com/bluesky/ophyd-async/blob/main/src/ophyd_async/fastcs/panda/_hdf_panda.py>`_
+
+- In a terminal:
+
+.. code-block:: bash
+
+    cd /dls_sw/work/R3.14.12.7/ioc/BL03I/BL03I-PY-IOC-02
+    source venv/bin/activate
+    pip freeze | grep pandablocks-ioc
+
+Note that the IOC location will soon be moving to ``prod`` instead of ``work``.
+
+- Compare the version from step one
+
+Updating the IOC
+""""""""""""""""""""""""""
+
+- Update the Python IOC repo in the venv:
+
+.. code-block:: bash
+
+    cd /dls_sw/work/R3.14.12.7/ioc/BL03I/BL03I-PY-IOC-02
+    source venv/bin/activate
+    pip install --upgrade pandablocks-ioc=={desired version}
+
+
+- After making sure the beamline isn't in use, restart the IOC:
+
+.. code-block:: bash
+
+    module load controls-tools
+
+    console BL03I-PY-IOC-02
+
+- Press ``ctrl+x``
+- Disconnect by pressing ``ctrl+e``, then press ``c``, then press ``.``

{mx_bluesky-1.4.6 → mx_bluesky-1.4.7}/docs/developer/hyperion/index.rst

@@ -20,3 +20,15 @@ Documentation specific for the Hyperion module within MX-Bluesky
         +++
 
         Technical reference material on standards in use.
+
+    .. grid-item-card:: :material-regular:`task;3em`
+
+        .. toctree::
+            :caption: How-to Guides
+            :maxdepth: 1
+
+            how-to/update-panda-ioc
+
+        +++
+
+        Practical step-by-step guides for day-to-day dev tasks.

{mx_bluesky-1.4.6 → mx_bluesky-1.4.7}/pull_request_template.md

@@ -1,7 +1,7 @@
 Fixes #ISSUE
 
 Link to dodal PR (if required): #XXX
-(remember to update `setup.cfg` with the dodal commit tag if you need it for tests to pass!)
+(remember to update `pyproject.toml` with the dodal commit tag if you need it for tests to pass!)
 
 ### Instructions to reviewer on how to test:
 

{mx_bluesky-1.4.6 → mx_bluesky-1.4.7}/pyproject.toml

@@ -18,7 +18,6 @@ dependencies = [
     #
     "annotated_types",
     "caproto",
-    "confluent-kafka==2.8.0",
     "fastapi[all]",
     "flask-restful",
     "ispyb",
@@ -46,8 +45,8 @@ dependencies = [
     "daq-config-server >= 0.1.1",
     "ophyd == 1.9.0",
     "ophyd-async >= 0.9.0a2",
-    "bluesky >= 1.13",
-    "dls-dodal == 1.41.0",
+    "bluesky >= 1.13.1",
+    "dls-dodal == 1.44.0",
 ]
 
 
@@ -72,7 +71,7 @@ dev = [
     "plantweb",
     "pre-commit",
     "pydata-sphinx-theme>=0.12",
-    "pyright==1.1.394",          # See https://github.com/DiamondLightSource/mx-bluesky/issues/875
+    "pyright",
     "pytest-asyncio",
     "pytest-cov",
     "pytest-random-order",
@@ -131,6 +130,8 @@ filterwarnings = [
     "error",
     # Ignore deprecation warning from sqlalchemy
     "ignore::sqlalchemy.exc.MovedIn20Warning",
+    # Remove when there's a fix for https://github.com/DiamondLightSource/ispyb-api/issues/233
+    "ignore::sqlalchemy.exc.SADeprecationWarning",
     # Ignore deprecation warning from setuptools_dso (remove when https://github.com/epics-base/setuptools_dso/issues/36 is released)
     "ignore::DeprecationWarning:wheel",
     # Ophyd status objects in tests
@@ -153,6 +154,8 @@ filterwarnings = [
     # Ignore warning about deprecations in python-workflows encountered during system tests
     # https://github.com/DiamondLightSource/python-workflows/issues/188
     "ignore:.*`Field` should not be instantiated.*:marshmallow.warnings.ChangedInMarshmallow4Warning",
+    # https://github.com/bluesky/ophyd-async/issues/838 and https://github.com/seperman/deepdiff/issues/536
+    "ignore:Accessing this attribute on the instance is deprecated",
 ]
 # Doctest python code in docs, python code in src docstrings, test functions in tests
 testpaths = "docs src tests/unit_tests"
@@ -198,15 +201,17 @@ commands_pre =
 src = ["src", "tests"]
 line-length = 88
 lint.select = [
-    "B",     # flake8-bugbear - https://docs.astral.sh/ruff/rules/#flake8-bugbear-b
-    "C4",    # flake8-comprehensions - https://docs.astral.sh/ruff/rules/#flake8-comprehensions-c4
-    "E",     # pycodestyle errors - https://docs.astral.sh/ruff/rules/#error-e
-    "F",     # pyflakes rules - https://docs.astral.sh/ruff/rules/#pyflakes-f
-    "W",     # pycodestyle warnings - https://docs.astral.sh/ruff/rules/#warning-w
-    "I",     # isort - https://docs.astral.sh/ruff/rules/#isort-i
-    "UP",    # pyupgrade - https://docs.astral.sh/ruff/rules/#pyupgrade-up
-    "SLF",   # self - https://docs.astral.sh/ruff/settings/#lintflake8-self
-    "PT012", # flake8-pytest-style rules - https://docs.astral.sh/ruff/rules/pytest-raises-with-multiple-statements/#pytest-raises-with-multiple-statements-pt012
+    "B",      # flake8-bugbear - https://docs.astral.sh/ruff/rules/#flake8-bugbear-b
+    "C4",     # flake8-comprehensions - https://docs.astral.sh/ruff/rules/#flake8-comprehensions-c4
+    "E",      # pycodestyle errors - https://docs.astral.sh/ruff/rules/#error-e
+    "F",      # pyflakes rules - https://docs.astral.sh/ruff/rules/#pyflakes-f
+    "W",      # pycodestyle warnings - https://docs.astral.sh/ruff/rules/#warning-w
+    "I",      # isort - https://docs.astral.sh/ruff/rules/#isort-i
+    "UP",     # pyupgrade - https://docs.astral.sh/ruff/rules/#pyupgrade-up
+    "SLF",    # self - https://docs.astral.sh/ruff/settings/#lintflake8-self
+    "PT012",  # flake8-pytest-style rules - https://docs.astral.sh/ruff/rules/pytest-raises-with-multiple-statements/#pytest-raises-with-multiple-statements-pt012
+    "RUF018", # walrus operators in asserts - https://docs.astral.sh/ruff/rules/assignment-in-assert/
+    "TID251", # banned api - https://docs.astral.sh/ruff/rules/banned-api/
 ]
 lint.extend-ignore = [
     "E501", # Line too long
@@ -215,8 +220,11 @@ lint.extend-ignore = [
 [tool.ruff.lint.per-file-ignores]
 # By default, private member access is allowed in tests
 # See https://github.com/DiamondLightSource/python-copier-template/issues/154
-# Remove this line to forbid private member access in tests
-"tests/**/*" = ["SLF001", "B023"]
+# Remove this line to forbid private member access, walrys operators in asserts, banned api in tests
+"tests/**/*" = ["SLF001", "B023", "RUF018", "TID251"]
+
+[tool.ruff.lint.flake8-tidy-imports.banned-api]
+"time.sleep".msg = "Use bps.sleep instead. # noqa will disable this rule for that line. See https://github.com/DiamondLightSource/mx-bluesky/issues/925"
 
 [tool.mypy]
 plugins = ["pydantic.mypy"]

{mx_bluesky-1.4.6 → mx_bluesky-1.4.7}/src/mx_bluesky/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.4.6'
-__version_tuple__ = version_tuple = (1, 4, 6)
+__version__ = version = '1.4.7'
+__version_tuple__ = version_tuple = (1, 4, 7)

mx_bluesky-1.4.7/src/mx_bluesky/beamlines/aithre_lasershaping/__init__.py

@@ -0,0 +1,13 @@
+from mx_bluesky.beamlines.aithre_lasershaping.check_goniometer_performance import (
+    check_omega_performance,
+)
+from mx_bluesky.beamlines.aithre_lasershaping.goniometer_controls import (
+    change_goniometer_turn_speed,
+    rotate_goniometer_relative,
+)
+
+__all__ = [
+    "check_omega_performance",
+    "change_goniometer_turn_speed",
+    "rotate_goniometer_relative",
+]

mx_bluesky-1.4.7/src/mx_bluesky/beamlines/aithre_lasershaping/check_goniometer_performance.py

@@ -0,0 +1,29 @@
+import bluesky.plan_stubs as bps
+from bluesky.utils import MsgGenerator
+from dodal.devices.aithre_lasershaping.goniometer import Goniometer
+
+DEFAULT_VELOCITIES = [5.0, 10.0, 20.0, 40.0, 80.0, 90.0]
+DEFAULT_POSITIONS = [
+    300.0,
+    -300.0,
+    600.0,
+    -600.0,
+    1200.0,
+    -1200.0,
+    2400.0,
+    -2400.0,
+    3600.0,
+    -3600.0,
+]
+
+
+def check_omega_performance(
+    goniometer: Goniometer,
+    velocities: list[float] = DEFAULT_VELOCITIES,
+    values: list[float] = DEFAULT_POSITIONS,
+) -> MsgGenerator:
+    """Move the goniometer from positive to negative to check omega performance"""
+    for omega_velocity in velocities:
+        yield from bps.abs_set(goniometer.omega.velocity, omega_velocity, wait=True)
+        for omega_value in values:
+            yield from bps.abs_set(goniometer.omega, omega_value, wait=True)

mx_bluesky-1.4.7/src/mx_bluesky/beamlines/aithre_lasershaping/goniometer_controls.py

@@ -0,0 +1,18 @@
+import bluesky.plan_stubs as bps
+from bluesky.utils import MsgGenerator
+from dodal.common import inject
+from dodal.devices.aithre_lasershaping.goniometer import Goniometer
+
+
+def rotate_goniometer_relative(
+    value: float, goniometer: Goniometer = inject("goniometer")
+) -> MsgGenerator:
+    """Adjust the goniometer position incrementally"""
+    yield from bps.rel_set(goniometer.omega, value, wait=True)
+
+
+def change_goniometer_turn_speed(
+    velocity: float, goniometer: Goniometer = inject("goniometer")
+) -> MsgGenerator:
+    """Set the velocity of the goniometer"""
+    yield from bps.mv(goniometer.omega.velocity, velocity)

{mx_bluesky-1.4.6 → mx_bluesky-1.4.7}/src/mx_bluesky/beamlines/i04/redis_to_murko_forwarder.py

@@ -1,6 +1,7 @@
 import io
 import json
 import pickle
+from datetime import timedelta
 from typing import TypedDict
 
 import numpy as np
@@ -14,13 +15,20 @@ from mx_bluesky.common.utils.log import LOGGER
 
 MURKO_ADDRESS = "tcp://i04-murko-prod.diamond.ac.uk:8008"
 
+MurkoResult = dict
+FullMurkoResults = dict[str, list[MurkoResult]]
+
 
 class MurkoRequest(TypedDict):
+    """See https://github.com/MartinSavko/murko#usage for more information."""
+
     to_predict: NDArray
     model_img_size: tuple[int, int]
     save: bool
     min_size: int
     description: list
+
+    # The identifier for each image
     prefix: list[str]
 
 
@@ -29,32 +37,26 @@ def get_image_size(image: NDArray) -> tuple[int, int]:
     return image.shape[1], image.shape[0]
 
 
-def send_to_murko_and_get_results(request: MurkoRequest) -> dict:
+def send_to_murko_and_get_results(request: MurkoRequest) -> FullMurkoResults:
     LOGGER.info(f"Sending {request['prefix']} to murko")
     context = zmq.Context()
     socket = context.socket(zmq.REQ)
     socket.connect(MURKO_ADDRESS)
     socket.send(pickle.dumps(request))
     raw_results = socket.recv()
+    assert isinstance(raw_results, bytes)
     results = pickle.loads(raw_results)
     LOGGER.info(f"Got {len(results['descriptions'])} results")
     return results
 
 
-def correlate_results_to_uuids(request: MurkoRequest, murko_results: dict) -> list:
-    results = []
-    uuids = request["prefix"]
-
-    width, height = get_image_size(request["to_predict"][0])
-
-    for uuid, prediction in zip(uuids, murko_results["descriptions"], strict=False):
-        coords = prediction["most_likely_click"]
-        y_coord = coords[0] * height
-        x_coord = coords[1] * width
-        results.append(
-            {"uuid": uuid, "x_pixel_coord": x_coord, "y_pixel_coord": y_coord}
-        )
-    return results
+def _correlate_results_to_uuids(
+    request: MurkoRequest, murko_results: FullMurkoResults
+) -> list[tuple[str, MurkoResult]]:
+    """We send a batch of images to murko, with each having a 'prefix' of the uuid that
+    we're using to keep track of the image. Murko sends back an ordered list of these,
+    which we match to the supplied prefix here."""
+    return list(zip(request["prefix"], murko_results["descriptions"], strict=False))
 
 
 class BatchMurkoForwarder:
@@ -94,16 +96,20 @@ class BatchMurkoForwarder:
             ],
             "prefix": uuids,
         }
-        predictions = send_to_murko_and_get_results(request_arguments)
-        results = correlate_results_to_uuids(request_arguments, predictions)
-        self._send_murko_results_to_redis(sample_id, results)
-
-    def _send_murko_results_to_redis(self, sample_id: str, results: list):
-        for result in results:
-            self.redis_client.hset(
-                f"murko:{sample_id}:results", result["uuid"], json.dumps(result)
-            )
-        self.redis_client.publish("murko-results", json.dumps(results))
+        results = send_to_murko_and_get_results(request_arguments)
+        results_with_uuids = _correlate_results_to_uuids(request_arguments, results)
+        self._send_murko_results_to_redis(sample_id, results_with_uuids)
+
+    def _send_murko_results_to_redis(
+        self, sample_id: str, results: list[tuple[str, MurkoResult]]
+    ):
+        """Stores the results into a redis hash (for longer term storage) and publishes
+        them as well so that downstream clients can get notified."""
+        for uuid, result in results:
+            redis_key = f"murko:{sample_id}:results"
+            self.redis_client.hset(redis_key, uuid, str(pickle.dumps(result)))
+            self.redis_client.expire(redis_key, timedelta(days=7))
+        self.redis_client.publish("murko-results", pickle.dumps(results))
 
     def add(self, sample_id: str, uuid: str, image: NDArray):
         """Add an image to the batch to send to murko."""

{mx_bluesky-1.4.6 → mx_bluesky-1.4.7}/src/mx_bluesky/beamlines/i04/thawing_plan.py

@@ -64,7 +64,7 @@ def thaw_and_stream_to_redis(
         yield from bps.kickoff(oav_to_redis_forwarder, wait=True)
         yield from bps.monitor(smargon.omega.user_readback, name="smargon")
         yield from bps.monitor(oav_to_redis_forwarder.uuid, name="oav")
-        yield from thaw(
+        yield from _thaw(
             time_to_thaw, rotation, thawer, smargon, switch_forwarder_to_ROI
         )
         yield from bps.complete(oav_to_redis_forwarder)
@@ -83,6 +83,15 @@ def thaw(
     rotation: float = 360,
     thawer: Thawer = inject("thawer"),
     smargon: Smargon = inject("smargon"),
+) -> MsgGenerator:
+    yield from _thaw(time_to_thaw, rotation, thawer, smargon)
+
+
+def _thaw(
+    time_to_thaw: float,
+    rotation: float = 360,
+    thawer: Thawer = inject("thawer"),
+    smargon: Smargon = inject("smargon"),
     plan_between_rotations: Callable[[], MsgGenerator] | None = None,
 ) -> MsgGenerator:
     """Rotates the sample and thaws it at the same time.

{mx_bluesky-1.4.6 → mx_bluesky-1.4.7}/src/mx_bluesky/beamlines/i24/serial/extruder/EX-gui-edm/DiamondExtruder-I24-py3v1.edl

@@ -34,8 +34,8 @@ h 308
 lineColor index 26
 fill
 fillColor index 25
-alarmPv "BL24I-EA-IOC-12:GP6"
-visPv "BL24I-EA-IOC-12:GP6"
+alarmPv "BL24I-MO-IOC-13:GP6"
+visPv "BL24I-MO-IOC-13:GP6"
 visMin "1"
 visMax "10"
 endObjectProperties
@@ -65,7 +65,7 @@ x 145
 y 328
 w 97
 h 30
-controlPv "BL24I-EA-IOC-12:GP9"
+controlPv "BL24I-MO-IOC-13:GP9"
 fgColor index 25
 fgAlarm
 bgColor index 3
@@ -83,7 +83,7 @@ x 145
 y 366
 w 97
 h 30
-controlPv "BL24I-EA-IOC-12:GP10"
+controlPv "BL24I-MO-IOC-13:GP10"
 fgColor index 25
 fgAlarm
 bgColor index 3
@@ -192,7 +192,7 @@ x 394
 y 124
 w 273
 h 30
-controlPv "BL24I-EA-IOC-12:GP2"
+controlPv "BL24I-MO-IOC-13:GP2"
 fgColor index 25
 fgAlarm
 bgColor index 3
@@ -210,7 +210,7 @@ x 394
 y 163
 w 273
 h 30
-controlPv "BL24I-EA-IOC-12:GP3"
+controlPv "BL24I-MO-IOC-13:GP3"
 fgColor index 25
 fgAlarm
 bgColor index 3
@@ -268,7 +268,7 @@ x 449
 y 200
 w 125
 h 30
-controlPv "BL24I-EA-IOC-12:GP4"
+controlPv "BL24I-MO-IOC-13:GP4"
 fgColor index 25
 fgAlarm
 bgColor index 3
@@ -286,7 +286,7 @@ x 448
 y 237
 w 125
 h 30
-controlPv "BL24I-EA-IOC-12:GP5"
+controlPv "BL24I-MO-IOC-13:GP5"
 fgColor index 25
 fgAlarm
 bgColor index 3
@@ -636,7 +636,7 @@ x 448
 y 315
 w 125
 h 30
-controlPv "BL24I-EA-IOC-12:GP7"
+controlPv "BL24I-MO-IOC-13:GP7"
 fgColor index 25
 fgAlarm
 bgColor index 3
@@ -1374,7 +1374,7 @@ x 393
 y 99
 w 253
 h 18
-controlPv "BL24I-EA-IOC-12:GP1"
+controlPv "BL24I-MO-IOC-13:GP1"
 format "decimal"
 font "arial-medium-r-16.0"
 fgColor index 25
@@ -1896,7 +1896,7 @@ x 430
 y 662
 w 86
 h 18
-controlPv "BL24I-EA-IOC-12:GP15"
+controlPv "BL24I-MO-IOC-13:GP15"
 format "decimal"
 font "arial-medium-r-16.0"
 fgColor index 16
@@ -1963,7 +1963,7 @@ fgColor index 14
 bgColor index 3
 topShadowColor index 1
 botShadowColor index 8
-controlPv "BL24I-EA-IOC-12:GP6"
+controlPv "BL24I-MO-IOC-13:GP6"
 font "arial-medium-r-18.0"
 numItems 2
 symbolTag {