Skip to content
This repository has been archived by the owner on Sep 2, 2024. It is now read-only.

Use dodal PulseOutput device for the Zebra output panel #1135

Merged
merged 6 commits into from
Feb 14, 2024
Merged

Use dodal PulseOutput device for the Zebra output panel #1135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dc9c9e4
Use new PulseOutput device in dodal
noemifrisina Feb 7, 2024
23a3b38
Update dodal device field names
noemifrisina Feb 13, 2024
d731371
Merge branch 'main' into dodal_299-use-zebra-pulse-output-device
noemifrisina Feb 14, 2024
6e980b1
Pin to dodal commit
noemifrisina Feb 14, 2024
d78f2f8
Retry pinning
noemifrisina Feb 14, 2024
39cef2a
Merge branch 'main' into dodal_299-use-zebra-pulse-output-device
noemifrisina Feb 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ install_requires =
xarray
doct
databroker
dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@5b8ef3e
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
Expand Down
4 changes: 2 additions & 2 deletions src/hyperion/device_setup_plans/setup_zebra.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,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.input, DISCONNECT, group=group)
LOGGER.info(f"ZEBRA SETUP: END - {'' if wait else 'not'} waiting for completion")
if wait:
yield from bps.wait(group)
Expand All @@ -129,7 +129,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.input, DISCONNECT, group=group)

if wait:
yield from bps.wait(group)
Expand Down
Loading