MNT #543 re-arrange

BCDA-APS · Oct 4, 2021 · 8ef0557 · 8ef0557
1 parent c781e76
commit 8ef0557
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 21 deletions.
diff --git a/apstools/_devices/__init__.py b/apstools/_devices/__init__.py
@@ -30,6 +30,7 @@
 from .shutters import OneSignalShutter
 from .shutters import ShutterBase
 from .shutters import SimulatedApsPssShutterWithStatus
+from .srs570_preamplifier import SRS570_PreAmplifier
 from .struck3820 import Struck3820
 from .tracking_signal import TrackingSignal
 from .xia_pf4 import DualPf4FilterBox
diff --git a/apstools/synApps/srs570_preamplifier.py → apstools/_devices/srs570_preamplifier.py b/apstools/synApps/srs570_preamplifier.py → apstools/_devices/srs570_preamplifier.py
@@ -7,6 +7,12 @@
 
     ~SRS570_PreAmplifier
 
+This device connects with the SRS570 support from synApps.
+(https://github.com/epics-modules/ip/blob/master/ipApp/Db/SR570.db)
+
+The SRS570 synApps support is part of the ``ip`` module:
+https://htmlpreview.github.io/?https://raw.githubusercontent.com/epics-modules/ip/R3-6-1/documentation/swaitRecord.html
+
 :see: https://github.com/epics-modules/ip
 """
 
@@ -71,6 +77,6 @@ def gain(self):
         Amplifier gain (A/V), as floating-point number.
         """
         return pint.Quantity(
-            float(self.sensitivity_value.get()), 
+            float(self.sensitivity_value.get()),
             self.sensitivity_unit.get()
         ).to("A/V").magnitude
diff --git a/apstools/devices.py b/apstools/devices.py
@@ -70,6 +70,7 @@
     ~apstools._devices.description_mixin.EpicsDescriptionMixin
     ~apstools._devices.kohzu_monochromator.KohzuSeqCtl_Monochromator
     ~ProcessController
+    ~apstools._devices.srs570_preamplifier.SRS570_PreAmplifier
     ~apstools._devices.struck3820.Struck3820
 
 Internal routines

diff --git a/apstools/synApps/__init__.py b/apstools/synApps/__init__.py
@@ -44,9 +44,6 @@
 from .swait import *
 from .transform import *
 
-# specific devices
-from .srs570_preamplifier import *
-
 __all__ = """
     AsynRecord
     BusyRecord
@@ -55,7 +52,6 @@
     CalcoutRecordChannel
     EpidRecord
     SaveData
-    SRS570_PreAmplifier
     SscanRecord
     SscanDevice
     SwaitRecord

diff --git a/docs/source/source/_devices.rst b/docs/source/source/_devices.rst
@@ -48,6 +48,9 @@ Submodules
 .. automodule:: apstools._devices.shutters
     :members:
 
+.. automodule:: apstools._devices.srs570_preamplifier
+    :members:
+
 .. automodule:: apstools._devices.struck3820
     :members:
 

diff --git a/docs/source/source/synApps/index.rst b/docs/source/source/synApps/index.rst
@@ -10,4 +10,3 @@ Support for EPICS synApps modules (records and databases).
    :glob:
 
    _*
-   srs570
diff --git a/docs/source/source/synApps/srs570.rst b/docs/source/source/synApps/srs570.rst
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,4 +10,3 @@ Support for EPICS synApps modules (records and databases).
		:glob:

		_*
		srs570