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.

Sign up for GitHub

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

Jump to bottom

(#494) Use ApertureScatterguard tolerances from parameter file #548

Merged
merged 4 commits into from
May 20, 2024
Merged

(#494) Use ApertureScatterguard tolerances from parameter file #548

merged 4 commits into from
May 20, 2024

Conversation

dperl-dls
Copy link
Collaborator

Fixes #494
Loads tolerances for ApertureScatterguard movements from the beamline parameters file

Instructions to reviewer on how to test:

  1. Run tests

Checks for reviewer

  • Would the PR title make sense to a scientist on a set of release notes
  • If a new device has been added does it follow the standards
  • If changing the API for a pre-existing device, ensure that any beamlines using this device have updated their Bluesky plans accordingly

@dperl-dls dperl-dls mentioned this pull request May 16, 2024
Merged
olliesilvester
olliesilvester requested changes May 20, 2024
View reviewed changes
Copy link
Collaborator

@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.

Logically looks good, but I think you may be using the miniap tolerance instead of scatterguard? Feel free to dismiss this if I'm wrong though

src/dodal/devices/aperturescatterguard.py
@@ -65,6 +84,8 @@ class AperturePositions:
SMALL: SingleAperturePosition
ROBOT_LOAD: SingleAperturePosition

tolerances: ApertureScatterguardTolerances
Copy link
Collaborator

Choose a reason for hiding this comment

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

Could capitalise this constant

src/dodal/devices/aperturescatterguard.py Show resolved Hide resolved
src/dodal/devices/aperturescatterguard.py Show resolved Hide resolved
@dperl-dls dperl-dls merged commit e06ae81 into main May 20, 2024
11 checks passed
@dperl-dls dperl-dls deleted the 494_use_beamline_params_for_apsg_tolerance branch May 20, 2024 16:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@olliesilvester olliesilvester olliesilvester approved these changes

@DominicOram DominicOram Awaiting requested review from DominicOram

@katesmith280 katesmith280 Awaiting requested review from katesmith280

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Use tolerances in beamline parameters file for aperture scatterguard
2 participants
@dperl-dls @olliesilvester