From cc537b6dac1cf806a1fd9f81860012fa72cfbc6c Mon Sep 17 00:00:00 2001
From: Andrew Walter <awalter@bnl.gov>
Date: Fri, 19 Apr 2024 14:05:55 -0400
Subject: [PATCH] Updating the BaffleSlit PVGroup to use the new
 areadetector.QuadEM PVGroup

---
 .../__pycache__/baffle_slit.cpython-312.pyc   | Bin 2454 -> 2436 bytes
 .../four_blade_electrometer.cpython-312.pyc   | Bin 2026 -> 0 bytes
 .../__pycache__/quad_em.cpython-312.pyc       | Bin 9825 -> 9853 bytes
 .../__pycache__/stats_plugin.cpython-312.pyc  | Bin 5400 -> 5414 bytes
 .../Caproto_servers/area_detector/quad_em.py  |   4 +-
 .../area_detector/stats_plugin.py             |   2 +-
 .../caproto_servers/baffle_slit.py            |   4 +-
 .../four_blade_electrometer.py                |  36 ------------------
 tests/test_caproto_servers.py                 |   4 --
 9 files changed, 5 insertions(+), 45 deletions(-)
 delete mode 100644 src/ari_sxn_simbeamline/Caproto_servers/__pycache__/four_blade_electrometer.cpython-312.pyc
 delete mode 100644 src/ari_sxn_simbeamline/caproto_servers/four_blade_electrometer.py

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
index 67a52b97ede468cc8a159972a875e74872ef1aae..5d003fa40b0c7ff3b9351cdaaed2a89ae6114a0e 100644
GIT binary patch
delta 161
zcmbOx+#<|-nwOW00SE*(Dy41S$ZNpJ&K6jjnBwZYIhZkzh0%HQAy$4yE>5fD(xRf&
zyprO{x7e~dIp92Bb_2%Alk3>KxdkL<uq~**!f)K-F<F$OSxhvsC^a!YCAB0qxg@_x
zuMlWxd}{9G4IJ4j1wi{gFf%eT-es`4&)|5O!SODG#$5*KFKmj8CKJTJFaW8^j+~(Y
DNqI4p

delta 179
zcmZn>o+iwDnwOW00SMka5Kp_fk=KAxOw=vEw8$wZF(uVCCpEdGC_gu~B(-R>3u7J&
zWAf(Bto)3e99GGtMMbH3C6mvvWpl8@I1cOvj8i5TvUl_Fi(e4e*${Pw&!NSAGCN1J
zgm@az(D)>fsqv{u#!g<qk*!t)wEqJ$BO~Ko2Alf~j+Yr6?=o24Wsv^DrpV~XI6?di
L1Bjli&lw5;gx)!q

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
deleted file mode 100644
index 02e3e38b9e837849d82748940467c94c8ce5ec8a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2026
zcmZ`)&2QX96d$j>yWZVwS|I&MTfs;aR0q1NR=E(MqD|X0DoPOvAF_}}Ue9dTjqPz~
z>}<01kV7QW1JDa<jyZ5BYX5+WQ?C`5hD3r`AdujK#Gz4gsCwd!cQ;KDSn_<o-~8V1
zy=VVWt(FlyfB$}{xs^xg4>jpOh2CKMdl=kC6j9Abfo5w#&dvq8tp|o}Xlgy@=YxV>
z&`=IdAgV7RYB24t-nF-j%%u6*69|d7a){})0BwO4uf5p6=vjYP>yGag@8-Ir&!D%<
zb_HyTwB#XH{#N@+vj<>quz_nwp4s+CO$|;})F}-um<y&={!49HMq2#f;|al&C@n{G
zk>C*%@j^Q2ahEvaDv2B+nMie!gqD^TD5ETl-9D=7L7?o}?m+hiNWze<QDo<+X6wtS
zsnOh$X&XQ-Pjzb0{Jp}i2+C=-T6}J`*jojG_MA0)tEJ~wOUr0pv&+-SDyIi7@<g2T
z9m+2F%#8&PSj>de0kO&$p0l{;Dvn!DjIXi~c4H=C%3w=kM@sH`utag&i(A?HC~hc3
z%=SRm${F5F%ahpk!3xV3Pkf3S3?~w-V~#0ndLi3|ZgTOza56K>AiXd<b@sza?1U6g
ze>w%2PT&KS#C?o&PP6GVEPXGQeJWSZUm42~PSx-yT+Cvg#JI)VxXp0e31dYmi75D%
zT_9MTh!B{%i4YJ`Jm>fcT+wh8ecojeap}b#4>Mfe%nUOzKq(-nR7)Zm3m}LCPY5o6
zjuQHG4WDPO2de#xfnbqfQr)MF_ez@Se?q~wTb|nj3c$t@40}PuMGPKTU2KJa5>H~8
z$OwX*`RDmQ4jB-a5OU1sW8rl1d~cRv+Gf6AciiiV*YyX-UclbOHFzwDIY9V+##>>-
zoC7&<1<yEO?O>ntSq%B2C{InlKYem?@_Fh!YAsL*_?+jmEJ$GE$+*kc?G<lUBdS*R
z!MlANns2n*DBj(@soy|f8VKEhLcNje6)Li{DJz%eWddcHnuK_v7ZU<iYe?odQv*s=
zriIyd)|Uv$vXKx8KnR>!eENC)BdA|l2W16ow;dlUqJEycNdQrh^$AGxq)~@_Bamxk
z+6&J0(ycCqTX%#<<a|h^7xdGx?mF<5h&ch+IfdMWq9a*aki7w|MGIm8Sae?g&#J8T
zeHnr?@&GhX7SS(e^=5I+JiK!Jk!h{IzHVCEuz{}5{JH<S9C>)AV~oW-nz8gWpXF<6
zgigTH5@aAHJoFbj#jysDV;*$OF)wUzN6=1b3`!vzS`{UsG9e@_6B2Nm_-Z^r$o0hW
zdpku!D17}$Mqel;Qys2N3ti~6*h5auK5$y?DepoiL3lK=AFQN`?R(+{Xho^ts0@%3
z&^%c}Te*R}xpPd*k8GK!a$se2wRzvzD8IWnzF9rALhlUUryJGr#fzJRhgae|BM*#?
z!3&EMoBM`WjXQ5YIKHuOV(F4l|BDP>`4%`{sQlUc{e%1&gpZMv_%VU%YkKpkL78-?
zzC+evI@k+mts73EeovXtLNOKUZ<m@elvG<l+>8Co#6dM0R=XATtKgCPP{_0b|B2m+
z4m+t4&C!N<RUOZ$Dmk8-?{u|4BSv7Vbdo+ak9AGcenaEyX#7`nbf<7oyQHm5>>$-Y
z9!18$a_2{Vc=MH$KOcH+v-;AbA?v51Q)@$~)~ly?@;N-ZW*l3*eCy~|0afr?xwiTS
cG$5u?T-LufZ<=cczIA!sz>h1)IFhmX2dMQ-P5=M^

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
index 88f7211a20ba2a4f275692d3cf43ea50ce6f895b..833f9b30148875d3f7077589ffb7b20bc18978e7 100644
GIT binary patch
delta 96
zcmaFp^Vf&>G%qg~0}xbiR7$(Dk=In!QZlh9H8DOVwInsUB)>?nAg44vGcP_Vu{gDe
i1E{cw6GX@WiCa>rDksOQPGNVr&A@w?!D#X?)pP*nH6LdH

delta 46
zcmezC^U#O)G%qg~0}#wzuavf9Bd@6{BlqM$RcS_^$<?Y;*o|&8@ZM!mnJlK34ggHz
B4RZhh

diff --git a/src/ari_sxn_simbeamline/Caproto_servers/area_detector/__pycache__/stats_plugin.cpython-312.pyc b/src/ari_sxn_simbeamline/Caproto_servers/area_detector/__pycache__/stats_plugin.cpython-312.pyc
index 7e6139cabd5b9086af9e1fca7a8276b0cafc40ec..dbd02b54850ea890702920de8037768ec9595767 100644
GIT binary patch
delta 49
zcmbQCwM>ieG%qg~0}xEzsFcPdx{*&rgkLhTC^a!YCAB0qxg@_xZ?dvT52M564I&u;
DN}dj6

delta 35
pcmZ3cHA9Q<G%qg~0}%YqRZ9COvXM_jgpqr)p-2y-(d2z1833;#3F!a;

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
index ab97836..9326b35 100644
--- 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
index b60ad39..a8c59a9 100644
--- 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
index aa0f9c8..22355fc 100644
--- 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
deleted file mode 100644
index 7d6df64..0000000
--- a/src/ari_sxn_simbeamline/caproto_servers/four_blade_electrometer.py
+++ /dev/null
@@ -1,36 +0,0 @@
-from caproto.server import PVGroup, pvproperty, ioc_arg_parser, run
-from textwrap import dedent
-
-
-class FourBladeElectrometer(PVGroup):
-    """
-    A PVGroup that generates the PVs associated with the 4 blade electrometer.
-
-    This class should be used to define the PVs for the 4 blade electrometers used
-    in the ARI and SXN beamlines for the Baffle slits.
-
-    TODO:
-    1. Work out how we want to update the returned current values based on the position
-    of the blades and the upstream mirrors.
-    2. Decide how we want to represent the electrometer PVs (and which ones are important).
-        - I suspect we will need some extra PVs (like dwell/acquisition time, ....) as well
-        as others. Take a look at the NSLS-II electrometer ophyd device for a list.
-    """
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)  # call the PVGroup __init__ function
-
-    # Add the current PVs
-    top = pvproperty(value=3E-6, name=':top', read_only=True)
-    bottom = pvproperty(value=3E-6, name=':bottom', read_only=True)
-    inboard = pvproperty(value=3E-6, name=':inboard', read_only=True)
-    outboard = pvproperty(value=3E-6, name=':outboard', read_only=True)
-
-
-# Add some code to start a version of the server if this file is 'run'.
-if __name__ == "__main__":
-    ioc_options, run_options = ioc_arg_parser(
-        default_prefix="Electrometer",
-        desc=dedent(FourBladeElectrometer.__doc__))
-    ioc = FourBladeElectrometer(**ioc_options)
-    run(ioc.pvdb, **run_options)
diff --git a/tests/test_caproto_servers.py b/tests/test_caproto_servers.py
index 63ee7c1..9dd2092 100644
--- 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={},