diff options
Diffstat (limited to 'qolab/hardware/lockin/__init__.py')
| -rw-r--r-- | qolab/hardware/lockin/__init__.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qolab/hardware/lockin/__init__.py b/qolab/hardware/lockin/__init__.py index 122db04..488c402 100644 --- a/qolab/hardware/lockin/__init__.py +++ b/qolab/hardware/lockin/__init__.py @@ -2,8 +2,8 @@ from qolab.hardware.scpi import SCPIinstr from qolab.hardware.basic import BasicInstrument class Lockin(BasicInstrument): - def __init__(self): - BasicInstrument.__init__(self) + 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' @@ -21,9 +21,9 @@ class LockinSCPI(SCPIinstr, Lockin): LockinSCPI(rm.open_resource('TCPIP::192.168.0.2::INSTR')) """ pass - def __init__(self, resource): + def __init__(self, resource, *args, **kwds): SCPIinstr.__init__(self, resource) - Lockin.__init__(self) + Lockin.__init__(self, *args, **kwds) self.config['DeviceId'] = str.strip(self.idn) from .srs_sr865a import SRS_SR865A |