From 2fe1ae62ec5a15a9c3d2ce8dbda07898390dea20 Mon Sep 17 00:00:00 2001 From: Noemi Frisina Date: Wed, 11 Sep 2024 15:22:11 +0100 Subject: [PATCH] Use pmac abort --- pyproject.toml | 2 +- .../i24/serial/fixed_target/i24ssx_Chip_Collect_py3v1.py | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 979727952..df7d37ba6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,7 +45,7 @@ dependencies = [ "ophyd == 1.9.0", "ophyd-async >= 0.3a5", "bluesky >= 1.13.0a4", - "dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@5e8b6fc2933a2b2b2e788d432c8408317ac4a5cc", + "dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@74e0fdc72edcabc0c3811a3c4549ac8db29a8b0a", ] diff --git a/src/mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Collect_py3v1.py b/src/mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Collect_py3v1.py index 7a75b5dca..5ccd528a2 100755 --- a/src/mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Collect_py3v1.py +++ b/src/mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Collect_py3v1.py @@ -609,9 +609,7 @@ def run_aborted_plan(pmac: PMAC, dcid: DCID): P variable. """ logger.warning("Data Collection Aborted") - yield from bps.abs_set(pmac.pmac_string, "A", wait=True) - yield from bps.sleep(1.0) - yield from bps.abs_set(pmac.pmac_string, "P2401=0", wait=True) + yield from bps.trigger(pmac.abort_program, wait=True) end_time = datetime.now() dcid.collection_complete(end_time, aborted=True)