Skip to content

Commit

Permalink
Merge pull request NSLS-II-ARI#13 from awalter-bnl/update_prettystr
Browse files Browse the repository at this point in the history
Update prettystr and reduce the number of options when tab-to-completing
  • Loading branch information
Jiemin-Li authored Jul 9, 2024
2 parents 0c2c614 + dcbb62c commit fb882cf
Show file tree
Hide file tree
Showing 4 changed files with 166 additions and 130 deletions.
Binary file modified src/ari_sxn_common/__pycache__/ari_ophyd.cpython-312.pyc
Binary file not shown.
Binary file modified src/ari_sxn_common/__pycache__/common_ophyd.cpython-312.pyc
Binary file not shown.
8 changes: 7 additions & 1 deletion src/ari_sxn_common/bluesky_test_setup.py
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

0 comments on commit fb882cf

Please sign in to comment.