Updating the BaffleSlit PVGroup to use the new areadetector.QuadEM PV…

…Group
NSLS-II-ARI · Apr 19, 2024 · cc537b6 · cc537b6
1 parent 5a4d7da
commit cc537b6
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 45 deletions.
diff --git a/src/ari_sxn_simbeamline/Caproto_servers/__pycache__/baffle_slit.cpython-312.pyc b/src/ari_sxn_simbeamline/Caproto_servers/__pycache__/baffle_slit.cpython-312.pyc
diff --git a/src/ari_sxn_simbeamline/Caproto_servers/__pycache__/four_blade_electrometer.cpython-312.pyc b/src/ari_sxn_simbeamline/Caproto_servers/__pycache__/four_blade_electrometer.cpython-312.pyc
diff --git a/src/ari_sxn_simbeamline/Caproto_servers/area_detector/__pycache__/quad_em.cpython-312.pyc b/src/ari_sxn_simbeamline/Caproto_servers/area_detector/__pycache__/quad_em.cpython-312.pyc
diff --git a/...ri_sxn_simbeamline/Caproto_servers/area_detector/__pycache__/stats_plugin.cpython-312.pyc b/...ri_sxn_simbeamline/Caproto_servers/area_detector/__pycache__/stats_plugin.cpython-312.pyc
diff --git a/src/ari_sxn_simbeamline/Caproto_servers/area_detector/quad_em.py b/src/ari_sxn_simbeamline/Caproto_servers/area_detector/quad_em.py
@@ -1,9 +1,9 @@
 from caproto.server import (pvproperty, PVGroup, SubGroup,
                             ioc_arg_parser, run)
 import math
-from plugin_base import PluginBase, pvproperty_rbv
+from area_detector.plugin_base import PluginBase, pvproperty_rbv
 import random
-from stats_plugin import StatsPlugin
+from area_detector.stats_plugin import StatsPlugin
 from textwrap import dedent
 import time
 

diff --git a/src/ari_sxn_simbeamline/Caproto_servers/area_detector/stats_plugin.py b/src/ari_sxn_simbeamline/Caproto_servers/area_detector/stats_plugin.py
@@ -1,5 +1,5 @@
 from caproto.server import pvproperty, ioc_arg_parser, run
-from plugin_base import PluginBase, pvproperty_rbv
+from area_detector.plugin_base import PluginBase, pvproperty_rbv
 from textwrap import dedent
 
 

diff --git a/src/ari_sxn_simbeamline/caproto_servers/baffle_slit.py b/src/ari_sxn_simbeamline/caproto_servers/baffle_slit.py
@@ -1,6 +1,6 @@
 from caproto.ioc_examples.fake_motor_record import FakeMotor
 from caproto.server import PVGroup, SubGroup, ioc_arg_parser, run
-from four_blade_electrometer import FourBladeElectrometer
+from area_detector.quad_em import QuadEM
 from textwrap import dedent
 
 
@@ -37,7 +37,7 @@ def __init__(self, *args, **kwargs):
                         resolution=6E-3, user_limits=(-1, 20), tick_rate_hz=10.,
                         prefix=':outboard')
 
-    current = SubGroup(FourBladeElectrometer, prefix=':current')
+    currents = SubGroup(QuadEM, prefix=':currents')
 
 
 # Add some code to start a version of the server if this file is 'run'.

diff --git a/src/ari_sxn_simbeamline/caproto_servers/four_blade_electrometer.py b/src/ari_sxn_simbeamline/caproto_servers/four_blade_electrometer.py
diff --git a/tests/test_caproto_servers.py b/tests/test_caproto_servers.py
@@ -18,10 +18,6 @@
                        dict(group_cls='AriM1',
                             kwargs={},
                             marks=[pytest.mark.skipif(numpy is None, reason="Requires numpy")],),
-                       "ARI_SXN_SimBeamline.caproto_servers.four_blade_electrometer":
-                       dict(group_cls='FourBladeElectrometer',
-                            kwargs={},
-                            marks=[pytest.mark.skipif(numpy is None, reason="Requires numpy")],),
                        "ARI_SXN_SimBeamline.caproto_servers.baffle_slit":
                        dict(group_cls='BaffleSlit',
                             kwargs={},