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

Update prettystr and reduce the number of options when tab-to-completing #13

Merged
merged 10 commits into from
Jul 9, 2024
Merged

Update prettystr and reduce the number of options when tab-to-completing #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
857f3ca
Adjusting PrettyStr to work with multiple lables
awalter-bnl Jun 18, 2024
7ba4d81
moving the multiple copies of the bottom signal level str method to a…
awalter-bnl Jun 18, 2024
2ec2bda
update the doc-strings in a few places for the change to PrettyStrFor…
awalter-bnl Jun 18, 2024
9f3acd1
Updating the name of PrettyStr to PrettyStrForDevices
awalter-bnl Jun 18, 2024
ed6e3e9
adding a custom __dir__() method to the PrettyStr... classes to restr…
awalter-bnl Jun 19, 2024
0299f3a
resolving a few formatting issues
awalter-bnl Jun 19, 2024
76e5289
found a line longer than 80 characters
awalter-bnl Jun 19, 2024
4d7136f
adding all built-in bluesky.plans to the global namespace and mv and …
awalter-bnl Jun 21, 2024
f8cc869
swapping move_relative to rel_move to make it consistent with the bui…
awalter-bnl Jun 21, 2024
dcbb62c
also adding relative_move as an alias to mvr for complete consistency
awalter-bnl Jun 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified src/ari_sxn_common/__pycache__/ari_ophyd.cpython-312.pyc
View file
Open in desktop
Binary file not shown.
Binary file modified src/ari_sxn_common/__pycache__/common_ophyd.cpython-312.pyc
View file
Open in desktop
Binary file not shown.
8 changes: 7 additions & 1 deletion src/ari_sxn_common/bluesky_test_setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
from ari_ophyd import M1
from bluesky import RunEngine
from bluesky.callbacks.best_effort import BestEffortCallback
from bluesky.plans import count, scan, grid_scan
from bluesky.plans import *
from bluesky.plan_stubs import mv, mvr
from bluesky.utils import ProgressBarManager
from databroker import Broker
from ophyd.signal import EpicsSignalBase
Expand All @@ -20,6 +21,11 @@

EpicsSignalBase.set_defaults(timeout=10, connection_timeout=10)

# Create some aliases which might help new users
move = mv
rel_move = mvr
relative_move = mvr

# Setup the m1 mirror ophyd object
m1_locations_data = {'measure': {'diag.locations': ('Out', None),
'slits.locations': ('nominal', None)},
Expand Down
Loading