Use pmac abort

DiamondLightSource · Sep 11, 2024 · 2fe1ae6 · 2fe1ae6
1 parent 8c7a0f9
commit 2fe1ae6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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)