Beam attenuation#35
Open
Dan Henriksen (dihenriksen) wants to merge 33 commits into
Open
Conversation
Jakub Wlodek (jwlodek)
requested changes
May 12, 2026
Jakub Wlodek (jwlodek)
left a comment
Jakub Wlodek (jwlodek)
left a comment
There was a problem hiding this comment.
Marked some suggestions. Mainly I'd recommend making both device classes Movables and re-work the current methods for changing states into a set method override.
Jakub Wlodek (jwlodek)
previously approved these changes
May 13, 2026
| """ | ||
| status = {} | ||
| active_attens = [] | ||
| en = self.photon_energy |
Contributor
There was a problem hiding this comment.
we are already in an async function here so
Suggested change
| en = self.photon_energy | |
| en = await self.energy.readback.value() |
I may be wrong about the exact name, ophyd-async has a verb for "get me the one true number for this or explode".
Contributor
Author
There was a problem hiding this comment.
energy is an ophyd object, so await does not work
| def get_egu(self): | ||
| return self.energy.egu | ||
|
|
||
| async def read(self): # type: ignore[reportUnknownParameterType] |
Contributor
There was a problem hiding this comment.
This needs a matched describe (unless ophyd async is providing more magic than I think it is)
| """ | ||
| status = {} | ||
| active_attens = [] | ||
| energy = self.get_photon_energy() |
Contributor
There was a problem hiding this comment.
use async flavor here for access to the hardware.
Contributor
Author
There was a problem hiding this comment.
energy is a regular ophyd object, not an ophyd-async object.
started writing tests; ignored eiger_async tests for now so that running tests is somewhat useful
wrap set method in AsyncStatus
…ot have to be zero-indexed
…ed xrayutilities to calculate the transmission
… bank is the transmission
added sha back to github action; properly formatted docstrings; pass in material and thickness to constructor; added pixi format task; pass energy into utility methods; remove property reading energy
removed sorting of available transmissions because we can find the best one in linear time; also it is easier to read
Co-authored-by: Thomas A Caswell <tcaswell@bnl.gov>
Thomas A Caswell (tacaswell)
force-pushed
the
beam-attenuation
branch
from
991eeef to
4385f2c
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Mainly, this PR creates the ability to attenuate a beam by giving control over a set of attenuators:
Also fixed various other issues: