Merge pull request #247 from BCDA-APS/256-synApps

shorten synApps_ophyd to synApps
BCDA-APS · Sep 3, 2019 · a3e0286 · a3e0286
2 parents 729014d + 2be6416
commit a3e0286
Show file tree

Hide file tree

Showing 18 changed files with 23 additions and 22 deletions.
diff --git a/apstools/devices.py b/apstools/devices.py
@@ -106,7 +106,7 @@
 import threading
 import time
 
-from .synApps_ophyd import *
+from .synApps import *
 
 from ophyd import Component, Device, DeviceStatus, FormattedComponent
 from ophyd import Signal, EpicsMotor, EpicsSignal, EpicsSignalRO

diff --git a/apstools/plans.py b/apstools/plans.py
@@ -637,7 +637,7 @@ def _get_sscan_data_objects(sscan):
     PARAMETERS
 
     sscan : Device
-        one EPICS sscan record (instance of `apstools.synApps_ophyd.sscanRecord`)
+        one EPICS sscan record (instance of `apstools.synApps.sscanRecord`)
 
     """
     scan_data_objects = OrderedDict()
@@ -667,7 +667,7 @@ def sscan_1D(
     PARAMETERS
 
     sscan : Device
-        one EPICS sscan record (instance of `apstools.synApps_ophyd.sscanRecord`)
+        one EPICS sscan record (instance of `apstools.synApps.sscanRecord`)
     running_stream : str or `None`
         (default: ``"primary"``)
         Name of document stream to write positioners and detectors data

diff --git a/apstools/synApps_ophyd/__init__.py → apstools/synApps/__init__.py b/apstools/synApps_ophyd/__init__.py → apstools/synApps/__init__.py
diff --git a/apstools/synApps_ophyd/_common.py → apstools/synApps/_common.py b/apstools/synApps_ophyd/_common.py → apstools/synApps/_common.py
diff --git a/apstools/synApps_ophyd/busy.py → apstools/synApps/busy.py b/apstools/synApps_ophyd/busy.py → apstools/synApps/busy.py
diff --git a/apstools/synApps_ophyd/calcout.py → apstools/synApps/calcout.py b/apstools/synApps_ophyd/calcout.py → apstools/synApps/calcout.py
diff --git a/apstools/synApps_ophyd/epid.py → apstools/synApps/epid.py b/apstools/synApps_ophyd/epid.py → apstools/synApps/epid.py
diff --git a/apstools/synApps_ophyd/save_data.py → apstools/synApps/save_data.py b/apstools/synApps_ophyd/save_data.py → apstools/synApps/save_data.py
@@ -6,7 +6,7 @@
 
 EXAMPLE
 
-    from apstools.synApps_ophyd import SaveData
+    from apstools.synApps import SaveData
     save_data = SaveData("xxx:saveData_", name="save_data")
 
 
@@ -40,7 +40,7 @@ class SaveData(Device):
     
     usage::
 
-        from apstools.synApps_ophyd import SaveData
+        from apstools.synApps import SaveData
         save_data = SaveData("xxx:saveData_", name="save_data")
 
     .. autosummary::

diff --git a/apstools/synApps_ophyd/sscan.py → apstools/synApps/sscan.py b/apstools/synApps_ophyd/sscan.py → apstools/synApps/sscan.py
@@ -6,8 +6,8 @@
 
 EXAMPLE
 
-    import apstools.synApps_ophyd
-    scans = apstools.synApps_ophyd.SscanDevice("xxx:", name="scans")
+    import apstools.synApps
+    scans = apstools.synApps.SscanDevice("xxx:", name="scans")
     scans.select_channels()     # only the channels configured in EPICS
 
 

diff --git a/apstools/synApps_ophyd/swait.py → apstools/synApps/swait.py b/apstools/synApps_ophyd/swait.py → apstools/synApps/swait.py
@@ -4,13 +4,13 @@
 
 EXAMPLES::
 
-    import apstools.synApps_ophyd
-    calcs = apstools.synApps_ophyd.UserCalcsDevice("xxx:", name="calcs")
+    import apstools.synApps
+    calcs = apstools.synApps.UserCalcsDevice("xxx:", name="calcs")
 
     calc1 = calcs.calc1
-    apstools.synApps_ophyd.setup_random_number_swait(calc1)
+    apstools.synApps.setup_random_number_swait(calc1)
 
-    apstools.synApps_ophyd.setup_incrementer_swait(calcs.calc2)
+    apstools.synApps.setup_incrementer_swait(calcs.calc2)
     
     calc1.reset()
 

diff --git a/apstools/synApps_ophyd/transform.py → apstools/synApps/transform.py b/apstools/synApps_ophyd/transform.py → apstools/synApps/transform.py
diff --git a/docs/source/source/synApps/_busy.rst b/docs/source/source/synApps/_busy.rst
@@ -5,6 +5,6 @@ synApps busy record
 see the synApps ``busy`` module suppport: 
 https://github.com/epics-modules/busy
 
-.. automodule:: apstools.synApps_ophyd.busy
+.. automodule:: apstools.synApps.busy
     :members: 
 
diff --git a/docs/source/source/synApps/_calcout.rst b/docs/source/source/synApps/_calcout.rst
@@ -5,6 +5,6 @@ EPICS base calcout record
 The ``calcout`` record is part of EPICS base:
 https://wiki-ext.aps.anl.gov/epics/index.php/RRM_3-14_Calcout
 
-.. automodule:: apstools.synApps_ophyd.calcout
+.. automodule:: apstools.synApps.calcout
     :members: 
 
diff --git a/docs/source/source/synApps/_epid.rst b/docs/source/source/synApps/_epid.rst
@@ -5,6 +5,6 @@ synApps epid record
 The ``epid`` record is part of the ``std`` module:
 https://epics.anl.gov/bcda/synApps/std/epidRecord.html
 
-.. automodule:: apstools.synApps_ophyd.epid
+.. automodule:: apstools.synApps.epid
     :members: 
 
diff --git a/docs/source/source/synApps/_sscan.rst b/docs/source/source/synApps/_sscan.rst
@@ -5,6 +5,6 @@ synApps sscan record
 see the synApps ``sscan`` module suppport: 
 https://github.com/epics-modules/sscan
 
-.. automodule:: apstools.synApps_ophyd.sscan
+.. automodule:: apstools.synApps.sscan
     :members: 
 
diff --git a/docs/source/source/synApps/_swait.rst b/docs/source/source/synApps/_swait.rst
@@ -8,6 +8,6 @@ https://htmlpreview.github.io/?https://raw.githubusercontent.com/epics-modules/c
 see the synApps ``calc`` module suppport: 
 https://github.com/epics-modules/calc
 
-.. automodule:: apstools.synApps_ophyd.swait
+.. automodule:: apstools.synApps.swait
     :members: 
 
diff --git a/docs/source/source/synApps/_transform.rst b/docs/source/source/synApps/_transform.rst
@@ -5,6 +5,6 @@ synApps transform record
 The ``transform`` record is part of the ``calc`` module:
     :see: https://htmlpreview.github.io/?https://raw.githubusercontent.com/epics-modules/calc/R3-6-1/documentation/TransformRecord.html#Fields
 
-.. automodule:: apstools.synApps_ophyd.transform
+.. automodule:: apstools.synApps.transform
     :members: 
 
diff --git a/ideas/issue_91/sscan_issue91.py b/ideas/issue_91/sscan_issue91.py
@@ -12,16 +12,17 @@
 """
 
 import asyncio
-from collections import deque
+from collections import deque, OrderedDict
+import numpy as np
 
 P = "xxx:"
 
 from ophyd.scaler import ScalerCH
 from ophyd import EpicsMotor
-from apstools.synApps_ophyd import UserCalcsDevice
-from apstools.synApps_ophyd import SscanDevice
-from apstools.synApps_ophyd import SaveData
-from apstools.synApps_ophyd import setup_lorentzian_swait
+from apstools.synApps import UserCalcsDevice
+from apstools.synApps import SscanDevice
+from apstools.synApps import SaveData
+from apstools.synApps import setup_lorentzian_swait
 
 scaler = ScalerCH(f"{P}scaler1", name="scaler")
 scaler.select_channels(None)