Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Configure shutter to always use the manual/auto option #446

Merged
merged 6 commits into from
Sep 5, 2024

Conversation

DominicOram
Copy link
Contributor

Fixes #232

Requires DiamondLightSource/dodal#770

To test:

  • Confirm tests still pass and logic is understandable

@DominicOram DominicOram marked this pull request as ready for review September 2, 2024 19:58
Copy link
Contributor

@olliesilvester olliesilvester left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, I just think setting the zebra to manual/automatic should be done within the set-up plans rather the top level plans, I may be wrong though

@@ -273,6 +275,13 @@ def run_gridscan(
LOGGER.info("Waiting for gridscan validity check")
yield from wait_for_gridscan_valid(feature_controlled.fgs_motors)

LOGGER.info("Set shutter to auto")
yield from bps.abs_set(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could: Set shutter to auto (or check that it's in auto mode) during the individual setup_zebra plans. It's potentially misleading for plans like setup_zebra_for_gridscan to call set_shutter_auto_input while it's actually still in manual. Another option is for set_shutter_auto_input to include this check

LOGGER.info("Tidying up Zebra")
yield from set_zebra_shutter_to_manual(fgs_composite.zebra, group=group, wait=wait)
LOGGER.info("Tidying up Zebra and shutter")
yield from tidy_up_zebra_after_gridscan(fgs_composite.zebra, group=group, wait=wait)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similar to my last comment, I think the tidy up plan itself should include setting the shutter to manual, otherwise the tidy_up_zebra_after_gridscan plan is a bit misleading

@DominicOram DominicOram merged commit 1d192e6 into main Sep 5, 2024
17 checks passed
@DominicOram DominicOram deleted the 232_configure_shutter_better branch September 5, 2024 09:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

FGS: Correctly configure zebra to allow manual shutter operation
2 participants