-
Notifications
You must be signed in to change notification settings - Fork 12
Wrap plans and plan stubs #1702
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
base: main
Are you sure you want to change the base?
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #1702 +/- ##
==========================================
+ Coverage 98.91% 99.09% +0.18%
==========================================
Files 271 275 +4
Lines 9922 10168 +246
==========================================
+ Hits 9814 10076 +262
+ Misses 108 92 -16 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
|
As discussed in the Athena drop-in today, this PR wraps some Bluesky plans which would allow 1D - ND scans. In view of the current differences in scan names between GDA and Bluesky, we should carefully consider the naming of these scans to reduce confusion for all users in the future. A non-exhaustive list is given below of what is currently achievable in GDA (through traditional and mapping scans), as well as what is achievable in Bluesky. I appreciate that some of the Bluesky scans will be covered by spec_scan in the future. I've included suggested names for use in the future, but suggestions for different names (and any corrections to current scans) are very welcome.
|
|
Re @bpp.run_decorator()
def timescan(detectors: list[StandardDetector], duration: float | int ):
trigger_info= TriggerInfo(livetime=float(duration) )
for det in detectors:
yield from bps.prepare(det, trigger_info)
yield from bps.trigger_and_read(detectors)With regards to the other naming conventions, I think if gda doesn't have an equivalent, go with the bluesky naming. If the bluesky one is exactly the same as the gda, go with the gda/bluesky one. If there is a clash make up something new that is explicit. If gda has it, but vanilla bluesky, maybe go with it, although some of the gda names aren't explicit so maybe this is a time to come up with better names. If you get those tests working, I'll take another look |
My understanding from the GDA docs was that I think there's enough clashing on |
RJCD-Diamond
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good, approving. Would be good to test this out on a beamline too before merging
Closes #1498
Wraps bluesky plans (
scan,rel_scan,grid_scan,rel_grid_scan) and plan stubs (rd,stop) for use in blueapi. Intended as a replacement for gda-stylestart stop stepscans untilspec_scanis stable and supportsstart stop steprather thanstart stop num.Instructions to reviewer on how to test:
Checks for reviewer