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

Add XBPM feedback for i03 #160

Merged
merged 10 commits into from
Sep 15, 2023
Merged

Add XBPM feedback for i03 #160

merged 10 commits into from
Sep 15, 2023

Conversation

DominicOram
Copy link
Contributor

Merge #142 first.

Needed for DiamondLightSource/hyperion#796

pyproject.toml Show resolved Hide resolved
pyproject.toml Show resolved Hide resolved
src/dodal/beamlines/i04.py Outdated Show resolved Hide resolved
src/dodal/devices/i04/transfocator.py Outdated Show resolved Hide resolved
src/dodal/devices/i04/transfocator.py Outdated Show resolved Hide resolved
src/dodal/devices/i04/transfocator.py Outdated Show resolved Hide resolved
src/dodal/devices/i04/transfocator.py Outdated Show resolved Hide resolved
src/dodal/devices/i04/transfocator.py Outdated Show resolved Hide resolved
src/dodal/devices/xbpm_feedback.py Outdated Show resolved Hide resolved
tests/devices/i04/test_transfocator.py Outdated Show resolved Hide resolved
@codecov
Copy link

codecov bot commented Sep 6, 2023

Codecov Report

Merging #160 (1d9100f) into main (7058d11) will increase coverage by 0.03%.
The diff coverage is 100.00%.

❗ Current head 1d9100f differs from pull request most recent head 3d2a48e. Consider uploading reports for the commit 3d2a48e to get more accurate results

@@            Coverage Diff             @@
##             main     #160      +/-   ##
==========================================
+ Coverage   89.50%   89.54%   +0.03%     
==========================================
  Files          71       71              
  Lines        2430     2438       +8     
==========================================
+ Hits         2175     2183       +8     
  Misses        255      255              
Files Changed Coverage Δ
src/dodal/beamlines/i03.py 87.67% <100.00%> (+0.52%) ⬆️
src/dodal/devices/xbpm_feedback.py 100.00% <100.00%> (ø)

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

Copy link
Contributor

@Tom-Willemsen Tom-Willemsen left a comment

Choose a reason for hiding this comment

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

Sorry, just one more substantive comment I noticed...

src/dodal/devices/i04/transfocator.py Outdated Show resolved Hide resolved
src/dodal/devices/i04/transfocator.py Outdated Show resolved Hide resolved
@DominicOram
Copy link
Contributor Author

DominicOram commented Sep 7, 2023

From https://jira.diamond.ac.uk/browse/I03-870 it looks like the stability check is no longer needed in dodal. I'll keep the status in ophyd as it could be generally useful but no longer use it here.

Copy link
Contributor

@Tom-Willemsen Tom-Willemsen left a comment

Choose a reason for hiding this comment

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

one minor suggestion, feel free to ignore and merge this if you like. Otherwise LGTM.

status = StableSubscriptionStatus(
self.pos_ok,
return SubscriptionStatus(
self.pos_stable,
lambda value, *args, **kwargs: value == 1,
Copy link
Contributor

Choose a reason for hiding this comment

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

[nit, ignorable]

Signature should be f(*, old_value, value, **kwargs)

I know this is technically correct but maybe it would be clearer to use the exact signature advised in the ophyd docs?

@DominicOram DominicOram merged commit d384abd into main Sep 15, 2023
14 checks passed
@DominicOram DominicOram deleted the hyperion_796_xbpm_feedback branch September 15, 2023 09:17
@olliesilvester olliesilvester restored the hyperion_796_xbpm_feedback branch November 8, 2023 10:28
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.

2 participants