From dc9c9e44b4fc1b1ceec3afa1c347b981681caee6 Mon Sep 17 00:00:00 2001 From: Noemi Frisina Date: Wed, 7 Feb 2024 17:40:05 +0000 Subject: [PATCH 1/4] Use new PulseOutput device in dodal --- setup.cfg | 2 +- src/hyperion/device_setup_plans/setup_zebra.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.cfg b/setup.cfg index 98503e712..58011bf33 100644 --- a/setup.cfg +++ b/setup.cfg @@ -35,7 +35,7 @@ install_requires = xarray doct databroker - dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@90d0e19427a6a22818deb3b2cff108ea6d1c1efa + dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@2bf489835a71aeb716dcfe9fe5f6195e8853a68e pydantic<2.0 # See https://github.com/DiamondLightSource/hyperion/issues/774 scipy pyzmq<25 # See https://github.com/DiamondLightSource/hyperion/issues/1103 diff --git a/src/hyperion/device_setup_plans/setup_zebra.py b/src/hyperion/device_setup_plans/setup_zebra.py index add7a5328..e8276d6ba 100644 --- a/src/hyperion/device_setup_plans/setup_zebra.py +++ b/src/hyperion/device_setup_plans/setup_zebra.py @@ -117,7 +117,7 @@ def setup_zebra_for_rotation( yield from bps.abs_set(zebra.output.out_pvs[TTL_DETECTOR], PC_PULSE, group=group) # Don't use the fluorescence detector yield from bps.abs_set(zebra.output.out_pvs[TTL_XSPRESS3], DISCONNECT, group=group) - yield from bps.abs_set(zebra.output.pulse_1_input, DISCONNECT, group=group) + yield from bps.abs_set(zebra.output.pulse_1.inp, DISCONNECT, group=group) LOGGER.info(f"ZEBRA SETUP: END - {'' if wait else 'not'} waiting for completion") if wait: yield from bps.wait(group) @@ -130,7 +130,7 @@ def setup_zebra_for_gridscan( yield from bps.abs_set(zebra.output.out_pvs[TTL_DETECTOR], IN3_TTL, group=group) yield from bps.abs_set(zebra.output.out_pvs[TTL_SHUTTER], IN4_TTL, group=group) yield from bps.abs_set(zebra.output.out_pvs[TTL_XSPRESS3], DISCONNECT, group=group) - yield from bps.abs_set(zebra.output.pulse_1_input, DISCONNECT, group=group) + yield from bps.abs_set(zebra.output.pulse_1.inp, DISCONNECT, group=group) if wait: yield from bps.wait(group) From 23a3b38ea6d2b2b63f82cf6a9300ca89fae7d99f Mon Sep 17 00:00:00 2001 From: Noemi Frisina Date: Tue, 13 Feb 2024 16:54:02 +0000 Subject: [PATCH 2/4] Update dodal device field names --- setup.cfg | 2 +- src/hyperion/device_setup_plans/setup_zebra.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.cfg b/setup.cfg index 58011bf33..c2bf5da55 100644 --- a/setup.cfg +++ b/setup.cfg @@ -35,7 +35,7 @@ install_requires = xarray doct databroker - dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@2bf489835a71aeb716dcfe9fe5f6195e8853a68e + dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@61d199bf0b964fc68effa2ae0e20e7a502760ab0 pydantic<2.0 # See https://github.com/DiamondLightSource/hyperion/issues/774 scipy pyzmq<25 # See https://github.com/DiamondLightSource/hyperion/issues/1103 diff --git a/src/hyperion/device_setup_plans/setup_zebra.py b/src/hyperion/device_setup_plans/setup_zebra.py index e8276d6ba..c4cb0c536 100644 --- a/src/hyperion/device_setup_plans/setup_zebra.py +++ b/src/hyperion/device_setup_plans/setup_zebra.py @@ -117,7 +117,7 @@ def setup_zebra_for_rotation( yield from bps.abs_set(zebra.output.out_pvs[TTL_DETECTOR], PC_PULSE, group=group) # Don't use the fluorescence detector yield from bps.abs_set(zebra.output.out_pvs[TTL_XSPRESS3], DISCONNECT, group=group) - yield from bps.abs_set(zebra.output.pulse_1.inp, DISCONNECT, group=group) + yield from bps.abs_set(zebra.output.pulse_1.input, DISCONNECT, group=group) LOGGER.info(f"ZEBRA SETUP: END - {'' if wait else 'not'} waiting for completion") if wait: yield from bps.wait(group) @@ -130,7 +130,7 @@ def setup_zebra_for_gridscan( yield from bps.abs_set(zebra.output.out_pvs[TTL_DETECTOR], IN3_TTL, group=group) yield from bps.abs_set(zebra.output.out_pvs[TTL_SHUTTER], IN4_TTL, group=group) yield from bps.abs_set(zebra.output.out_pvs[TTL_XSPRESS3], DISCONNECT, group=group) - yield from bps.abs_set(zebra.output.pulse_1.inp, DISCONNECT, group=group) + yield from bps.abs_set(zebra.output.pulse_1.input, DISCONNECT, group=group) if wait: yield from bps.wait(group) From 6e980b1d09fd1f14382a3ed5277121c2fb9be8bf Mon Sep 17 00:00:00 2001 From: Noemi Frisina Date: Wed, 14 Feb 2024 13:27:15 +0000 Subject: [PATCH 3/4] Pin to dodal commit --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 0161cebf4..a43ce6f1d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -35,7 +35,7 @@ install_requires = xarray doct databroker - dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@0dfcfc7cbb2f400cfc21d19f6371b9a22e347d7a + dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@0de7d0513a4e5b2ca4a73a349efde1901808c1a58 pydantic<2.0 # See https://github.com/DiamondLightSource/hyperion/issues/774 scipy pyzmq<25 # See https://github.com/DiamondLightSource/hyperion/issues/1103 From d78f2f84bce06353853910b51929083350d30cdb Mon Sep 17 00:00:00 2001 From: Noemi Frisina Date: Wed, 14 Feb 2024 15:17:29 +0000 Subject: [PATCH 4/4] Retry pinning --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index a43ce6f1d..92b357e75 100644 --- a/setup.cfg +++ b/setup.cfg @@ -35,7 +35,7 @@ install_requires = xarray doct databroker - dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@0de7d0513a4e5b2ca4a73a349efde1901808c1a58 + dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@328330036a23cae8748e84a26eb9b77ad113f8a5 pydantic<2.0 # See https://github.com/DiamondLightSource/hyperion/issues/774 scipy pyzmq<25 # See https://github.com/DiamondLightSource/hyperion/issues/1103