Replaced the homebrew async caget with the one from aioca.

environment.yml

@@ -135,6 +135,7 @@ dependencies:
   # - pygithub
 
   - pip:
+    - aioca
     - apsbss
     - time-machine
     - autoapi

src/firefly/area_detector_viewer.py

@@ -18,9 +18,7 @@
 
 
 class AreaDetectorViewerDisplay(display.FireflyDisplay):
-    caqtdm_ui_file: str = (
-        "/APSshare/epics/synApps_6_2_1/support/areaDetector-R3-12-1/ADAravis/aravisApp/op/ui/autoconvert/ADAravis.ui"
-    )
+    caqtdm_ui_file: str = "/APSshare/epics/synApps_6_2_1/support/areaDetector-R3-12-1/ADAravis/aravisApp/op/ui/autoconvert/ADAravis.ui"
     image_is_new: bool = True
 
     def customize_device(self):

src/firefly/ion_chamber.py

@@ -9,12 +9,8 @@ class IonChamberDisplay(display.FireflyDisplay):
     """A GUI window for changing settings in an ion chamber."""
 
     caqtdm_scaler_ui_file: str = "/net/s25data/xorApps/ui/scaler32_full_offset.ui"
-    caqtdm_mcs_ui_file: str = (
-        "/APSshare/epics/synApps_6_2_1/support/mca-R7-9//mcaApp/op/ui/autoconvert/SIS38XX.ui"
-    )
-    caqtdm_preamp_ui_file: str = (
-        "/net/s25data/xorApps/epics/synApps_6_2_1/support/ip-GIT/ipApp/op/ui/autoconvert/SR570.ui"
-    )
+    caqtdm_mcs_ui_file: str = "/APSshare/epics/synApps_6_2_1/support/mca-R7-9//mcaApp/op/ui/autoconvert/SIS38XX.ui"
+    caqtdm_preamp_ui_file: str = "/net/s25data/xorApps/epics/synApps_6_2_1/support/ip-GIT/ipApp/op/ui/autoconvert/SR570.ui"
 
     def customize_device(self):
         self._device = registry.find(self.macros()["IC"])

src/firefly/voltmeters.py

@@ -17,9 +17,7 @@
 class VoltmetersDisplay(display.FireflyDisplay):
     _ion_chamber_displays = []
     caqtdm_scaler_ui_file: str = "/net/s25data/xorApps/ui/scaler32_full_offset.ui"
-    caqtdm_mcs_ui_file: str = (
-        "/APSshare/epics/synApps_6_2_1/support/mca-R7-9//mcaApp/op/ui/autoconvert/SIS38XX.ui"
-    )
+    caqtdm_mcs_ui_file: str = "/APSshare/epics/synApps_6_2_1/support/mca-R7-9//mcaApp/op/ui/autoconvert/SIS38XX.ui"
 
     def __init__(
         self,

src/haven/exceptions.py

@@ -87,7 +87,8 @@ class SignalNotFound(KeyError):
     ...
 
 
-class EmptySignalName(ValueError): ...
+class EmptySignalName(ValueError):
+    ...
 
 
 class InvalidTransformation(TypeError):

src/haven/instrument/area_detector.py

@@ -56,13 +56,16 @@ class AsyncCamMixin(OphydObject):
     acquire = ADCpt(SignalWithRBV, "Acquire")
 
 
-class SimDetectorCam_V34(CamMixin_V34, SimDetectorCam): ...
+class SimDetectorCam_V34(CamMixin_V34, SimDetectorCam):
+    ...
 
 
-class EigerCam(AsyncCamMixin, EigerDetectorCam): ...
+class EigerCam(AsyncCamMixin, EigerDetectorCam):
+    ...
 
 
-class LambdaCam(AsyncCamMixin, Lambda750kCam): ...
+class LambdaCam(AsyncCamMixin, Lambda750kCam):
+    ...
 
 
 class WriteModes(IntEnum):
@@ -130,10 +133,12 @@ class StatsMixin:
     ]
 
 
-class StatsPlugin_V31(StatsMixin, OphydStatsPlugin_V31): ...
+class StatsPlugin_V31(StatsMixin, OphydStatsPlugin_V31):
+    ...
 
 
-class StatsPlugin_V34(StatsMixin, OphydStatsPlugin_V34): ...
+class StatsPlugin_V34(StatsMixin, OphydStatsPlugin_V34):
+    ...
 
 
 class SimDetector(SingleTrigger_V34, DetectorBase):

src/haven/instrument/ion_chamber.py

@@ -10,6 +10,7 @@
 
 import numpy as np
 import pint
+from aioca import caget
 from apstools.devices import SRS570_PreAmplifier
 from ophyd import Component as Cpt
 from ophyd import Device, EpicsSignal, EpicsSignalRO
@@ -26,7 +27,6 @@
 from .. import exceptions
 from .._iconfig import load_config
 from .device import aload_devices, await_for_connection, make_device
-from .epics import caget
 from .instrument_registry import registry
 from .labjack import AnalogInput
 from .scaler_triggered import ScalerSignalRO, ScalerTriggered

src/haven/instrument/motor.py

@@ -2,12 +2,12 @@
 import logging
 from typing import Optional
 
+from aioca import caget
 from ophyd import Component as Cpt
 from ophyd import EpicsMotor, EpicsSignal, EpicsSignalRO
 
 from .._iconfig import load_config
 from .device import aload_devices, make_device
-from .epics import caget
 from .instrument_registry import registry
 
 log = logging.getLogger(__name__)

src/haven/instrument/scaler_triggered.py

@@ -44,10 +44,12 @@ def _trigger_scaler(self, *args, **kwargs):
         return new_status
 
 
-class ScalerSignal(ScalerTriggered, EpicsSignal): ...
+class ScalerSignal(ScalerTriggered, EpicsSignal):
+    ...
 
 
-class ScalerSignalRO(ScalerTriggered, EpicsSignalRO): ...
+class ScalerSignalRO(ScalerTriggered, EpicsSignalRO):
+    ...
 
 
 # -----------------------------------------------------------------------------