refactor power supply to avoid circular loads

3 files changed, 48 insertions, 41 deletions

diff --git a/qolab/hardware/power_supply/__init__.py b/qolab/hardware/power_supply/__init__.py
index 6635584..76b812c 100644
--- a/qolab/hardware/power_supply/__init__.py
+++ b/qolab/hardware/power_supply/__init__.py
@@ -1,42 +1,5 @@
-from qolab.hardware.scpi import SCPIinstr
-from qolab.hardware.basic import BasicInstrument
+"""Power supplies."""
 
+from .keysight_e3612a import KeysightE3612A
 
-class PowerSupply(BasicInstrument):
-    """Base class for a Power Supply.
-
-    Contains minimal set of methods to be implemented by a Power Supply.
-
-    Intended to be used as a parent for hardware aware power supplies.
-    """
-
-    def __init__(self, *args, **kwds):
-        BasicInstrument.__init__(self, *args, **kwds)
-        self.config["Device type"] = "PowerSupply"
-        self.config["Device model"] = (
-            "Generic Power Supply generator Without Hardware interface"
-        )
-        self.config["FnamePrefix"] = "power_supply"
-        self.deviceProperties.update({})
-
-
-class PowerSupplySCPI(SCPIinstr, PowerSupply):
-    """SCPI aware power supply.
-
-    Intended to be used as a parent for hardware aware power supplies.
-
-    Example
-    -------
-
-    >>> rm = pyvisa.ResourceManager()
-    >>> PowerSupplySCPI(rm.open_resource('TCPIP::192.168.0.2::INSTR'))
-
-    or
-
-    >>> PowerSupplySCPI(rm.open_resource('USB0::10893::4354::MY61001869::0::INSTR'))
-    """
-
-    def __init__(self, resource, *args, **kwds):
-        SCPIinstr.__init__(self, resource)
-        PowerSupply.__init__(self, *args, **kwds)
-        self.config["DeviceId"] = str.strip(self.idn)
+__all__ = ["KeysightE3612A"]
diff --git a/qolab/hardware/power_supply/_basic.py b/qolab/hardware/power_supply/_basic.py
new file mode 100644
index 0000000..265ee32
--- /dev/null
+++ b/qolab/hardware/power_supply/_basic.py
@@ -0,0 +1,44 @@
+"""Basic class to build hardware avare classes of power supplies."""
+
+from qolab.hardware.scpi import SCPIinstr
+from qolab.hardware.basic import BasicInstrument
+
+
+class PowerSupply(BasicInstrument):
+    """Base class for a Power Supply.
+
+    Contains minimal set of methods to be implemented by a Power Supply.
+
+    Intended to be used as a parent for hardware aware power supplies.
+    """
+
+    def __init__(self, *args, **kwds):
+        BasicInstrument.__init__(self, *args, **kwds)
+        self.config["Device type"] = "PowerSupply"
+        self.config[
+            "Device model"
+        ] = "Generic Power Supply generator Without Hardware interface"
+        self.config["FnamePrefix"] = "power_supply"
+        self.deviceProperties.update({})
+
+
+class PowerSupplySCPI(SCPIinstr, PowerSupply):
+    """SCPI aware power supply.
+
+    Intended to be used as a parent for hardware aware power supplies.
+
+    Example
+    -------
+
+    >>> rm = pyvisa.ResourceManager()
+    >>> PowerSupplySCPI(rm.open_resource('TCPIP::192.168.0.2::INSTR'))
+
+    or
+
+    >>> PowerSupplySCPI(rm.open_resource('USB0::10893::4354::MY61001869::0::INSTR'))
+    """
+
+    def __init__(self, resource, *args, **kwds):
+        SCPIinstr.__init__(self, resource)
+        PowerSupply.__init__(self, *args, **kwds)
+        self.config["DeviceId"] = str.strip(self.idn)
diff --git a/qolab/hardware/power_supply/keysight_e3612a.py b/qolab/hardware/power_supply/keysight_e3612a.py
index f843795..62336e3 100644
--- a/qolab/hardware/power_supply/keysight_e3612a.py
+++ b/qolab/hardware/power_supply/keysight_e3612a.py
@@ -1,5 +1,5 @@
 from qolab.hardware.basic import BasicInstrument
-from qolab.hardware.power_supply import PowerSupplySCPI
+from ._basic import PowerSupplySCPI
 import time