Merge pull request NSLS-II-ARI#15 from awalter-bnl/add_GV

Add Gatevalve object
awalter-bnl · Jul 24, 2024 · 434e982 · 434e982
2 parents cd7c21e + 7b9877b
commit 434e982
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 3 deletions.
diff --git a/src/ari_sxn_common/__pycache__/.DS_Store → src/.DS_Store b/src/ari_sxn_common/__pycache__/.DS_Store → src/.DS_Store
diff --git a/src/ari_sxn_common/.DS_Store b/src/ari_sxn_common/.DS_Store
diff --git a/src/ari_sxn_common/__pycache__/ari_ophyd.cpython-310.pyc b/src/ari_sxn_common/__pycache__/ari_ophyd.cpython-310.pyc
diff --git a/src/ari_sxn_common/__pycache__/ari_ophyd.cpython-312.pyc b/src/ari_sxn_common/__pycache__/ari_ophyd.cpython-312.pyc
diff --git a/src/ari_sxn_common/__pycache__/common_bluesky.cpython-312.pyc b/src/ari_sxn_common/__pycache__/common_bluesky.cpython-312.pyc
diff --git a/src/ari_sxn_common/__pycache__/common_ophyd.cpython-310.pyc b/src/ari_sxn_common/__pycache__/common_ophyd.cpython-310.pyc
diff --git a/src/ari_sxn_common/__pycache__/common_ophyd.cpython-312.pyc b/src/ari_sxn_common/__pycache__/common_ophyd.cpython-312.pyc
diff --git a/src/ari_sxn_common/ari_ophyd.py b/src/ari_sxn_common/ari_ophyd.py
@@ -1,6 +1,7 @@
 from common_ophyd import (BaffleSlit, Diagnostic, DeviceWithLocations,
                           ID29EpicsMotor, ID29EpicsSignalRO)
 from ophyd import Component
+from nslsii.devices import TwoButtonShutter
 
 
 class M1(DeviceWithLocations):
@@ -83,6 +84,9 @@ def __init__(self, *args, **kwargs):
                     labels=('detector',))
     ip = Component(ID29EpicsSignalRO, "ip", name='ip', kind='config',
                    labels=('detector',))
+    gv = Component(TwoButtonShutter, "gv:", name='gv', kind='config',
+                   labels=('position',))
+
 
     # baffle slit sub-device
     slits = Component(BaffleSlit, "baffle:", name='slits', kind='normal',

diff --git a/src/ari_sxn_common/bluesky_test_setup.py b/src/ari_sxn_common/bluesky_test_setup.py
@@ -1,5 +1,5 @@
 """ This file is used to setup a bluesky session with standard items"""
-from ari_ophyd import M1
+import ari_ophyd
 from bluesky import RunEngine
 from bluesky.callbacks.best_effort import BestEffortCallback
 from bluesky import plans as plans
@@ -36,8 +36,9 @@
                                  'slits.locations': ('nominal', None)},
                      'Yag': {'diag.locations': ('YaG', None),
                              'slits.locations': ('nominal', None)}}
-m1 = M1('ARI_M1:', name='m1', locations_data=m1_locations_data,
-        labels=('device',))
+m1 = ari_ophyd.M1('ARI_M1:', name='m1', locations_data=m1_locations_data,
+                  labels=('device',))
+M1 = m1  # Create a reference object so that m1 or M1 are equivalent.
 
 plans = common_bluesky.PlanCollector(
     plans_to_import=common_bluesky._plans_to_import,