refactor lockins to avoid circular loads

3 files changed, 56 insertions, 49 deletions

diff --git a/qolab/hardware/lockin/__init__.py b/qolab/hardware/lockin/__init__.py
index c82571f..744473e 100644
--- a/qolab/hardware/lockin/__init__.py
+++ b/qolab/hardware/lockin/__init__.py
@@ -1,50 +1,5 @@
-from qolab.hardware.scpi import SCPIinstr
-from qolab.hardware.basic import BasicInstrument
+"""Lockin package."""
 
+from .srs_sr865a import SRS_SR865A
 
-class Lockin(BasicInstrument):
-    """Basic lockin class with.
-    Intended to be expanded in hardware specific classes.
-    """
-
-    def __init__(self, *args, **kwds):
-        BasicInstrument.__init__(self, *args, **kwds)
-        self.config["Device type"] = "Lockin"
-        self.config["FnamePrefix"] = "lockin"
-        self.config["Device model"] = "Generic Lockin Without Hardware interface"
-        self.config["FnamePrefix"] = "lockin"
-        self.deviceProperties.update(
-            {
-                "FreqInt",
-                "FreqExt",
-                "Harm",
-                "SinAmpl",
-                "SinOffset",
-                "RefPhase",
-                "Sensitivity",
-                "TimeConstan",
-                "FilterSlope",
-                "EquivalentNoiseBW",
-            }
-        )
-
-    # Minimal set of methods to be implemented.
-    pass
-
-
-class LockinSCPI(SCPIinstr, Lockin):
-    """Basic lockin class with SCPI interface.
-    Intended to be expanded in hardware specific classes.
-
-    Example
-    -------
-    >>> rm = pyvisa.ResourceManager()
-    >>> LockinSCPI(rm.open_resource('TCPIP::192.168.0.2::INSTR'))
-    """
-
-    pass
-
-    def __init__(self, resource, *args, **kwds):
-        SCPIinstr.__init__(self, resource)
-        Lockin.__init__(self, *args, **kwds)
-        self.config["DeviceId"] = str.strip(self.idn)
+__all__ = ["SRS_SR865A"]
diff --git a/qolab/hardware/lockin/_basic.py b/qolab/hardware/lockin/_basic.py
new file mode 100644
index 0000000..f8c9795
--- /dev/null
+++ b/qolab/hardware/lockin/_basic.py
@@ -0,0 +1,52 @@
+"""Basic lockin classes intended for expansion with hardware aware classes."""
+
+from qolab.hardware.scpi import SCPIinstr
+from qolab.hardware.basic import BasicInstrument
+
+
+class Lockin(BasicInstrument):
+    """Basic lockin class with.
+    Intended to be expanded in hardware specific classes.
+    """
+
+    def __init__(self, *args, **kwds):
+        BasicInstrument.__init__(self, *args, **kwds)
+        self.config["Device type"] = "Lockin"
+        self.config["FnamePrefix"] = "lockin"
+        self.config["Device model"] = "Generic Lockin Without Hardware interface"
+        self.config["FnamePrefix"] = "lockin"
+        self.deviceProperties.update(
+            {
+                "FreqInt",
+                "FreqExt",
+                "Harm",
+                "SinAmpl",
+                "SinOffset",
+                "RefPhase",
+                "Sensitivity",
+                "TimeConstan",
+                "FilterSlope",
+                "EquivalentNoiseBW",
+            }
+        )
+
+    # Minimal set of methods to be implemented.
+    pass
+
+
+class LockinSCPI(SCPIinstr, Lockin):
+    """Basic lockin class with SCPI interface.
+    Intended to be expanded in hardware specific classes.
+
+    Example
+    -------
+    >>> rm = pyvisa.ResourceManager()
+    >>> LockinSCPI(rm.open_resource('TCPIP::192.168.0.2::INSTR'))
+    """
+
+    pass
+
+    def __init__(self, resource, *args, **kwds):
+        SCPIinstr.__init__(self, resource)
+        Lockin.__init__(self, *args, **kwds)
+        self.config["DeviceId"] = str.strip(self.idn)
diff --git a/qolab/hardware/lockin/srs_sr865a.py b/qolab/hardware/lockin/srs_sr865a.py
index b175274..56f76e6 100644
--- a/qolab/hardware/lockin/srs_sr865a.py
+++ b/qolab/hardware/lockin/srs_sr865a.py
@@ -1,4 +1,4 @@
-from qolab.hardware.lockin import LockinSCPI
+from ._basic import LockinSCPI
 from qolab.hardware.scpi import SCPI_PROPERTY