adding the pretty string dunder methods to TwoButtonShutter

awalter-bnl · Jul 25, 2024 · 3975b39 · 3975b39
1 parent e6c7edb
commit 3975b39
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
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_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,7 +1,8 @@
 from common_ophyd import (BaffleSlit, Diagnostic, DeviceWithLocations,
-                          ID29EpicsMotor, ID29EpicsSignalRO)
+                          ID29EpicsMotor, ID29EpicsSignalRO,
+                          ID29TwoButtonShutter)
 from ophyd import Component
-from nslsii.devices import TwoButtonShutter
+
 
 
 class M1(DeviceWithLocations):
@@ -84,7 +85,7 @@ 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',
+    gv = Component(ID29TwoButtonShutter, "gv:", name='gv', kind='config',
                    labels=('position',))
 
 

diff --git a/src/ari_sxn_common/common_ophyd.py b/src/ari_sxn_common/common_ophyd.py
@@ -1,4 +1,5 @@
 from collections import defaultdict
+from nslsii.devices import TwoButtonShutter
 from ophyd import (Component, Device, EpicsMotor)
 from ophyd.areadetector.base import ADComponent
 from ophyd.areadetector.cam import ProsilicaDetectorCam
@@ -257,6 +258,13 @@ def __init__(self, *args, **kwargs):
                 device.kind = 'omitted'  # set signal to 'omitted'.
 
 
+class ID29TwoButtonShutter(PrettyStrForSignal, TwoButtonShutter):
+    """
+    An nslsii.devices.TwoButtonShutter class that adds the `__str__` and
+    `__dir__` methods from PrettyStrForSignal
+    """
+
+
 class Prosilica(PrettyStrForSignal, SingleTrigger, ProsilicaDetector):
     """
     Adds the `cam1.array_data` attribute required when not image saving.