aboutsummaryrefslogtreecommitdiff
path: root/qolab/hardware
diff options
context:
space:
mode:
Diffstat (limited to 'qolab/hardware')
-rw-r--r--qolab/hardware/lockin/__init__.py34
1 files changed, 25 insertions, 9 deletions
diff --git a/qolab/hardware/lockin/__init__.py b/qolab/hardware/lockin/__init__.py
index 8726e59..4f27414 100644
--- a/qolab/hardware/lockin/__init__.py
+++ b/qolab/hardware/lockin/__init__.py
@@ -1,27 +1,43 @@
from qolab.hardware.scpi import SCPIinstr
from qolab.hardware.basic import BasicInstrument
+
class Lockin(BasicInstrument):
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'})
+ 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):
- """
+ """
Do not instantiate directly, use
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)
+ self.config["DeviceId"] = str.strip(self.idn)