diff options
Diffstat (limited to 'qolab/hardware')
| -rw-r--r-- | qolab/hardware/rf_generator/__init__.py | 3 | ||||
| -rw-r--r-- | qolab/hardware/scope/__init__.py | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/qolab/hardware/rf_generator/__init__.py b/qolab/hardware/rf_generator/__init__.py index a82c1a0..15a366e 100644 --- a/qolab/hardware/rf_generator/__init__.py +++ b/qolab/hardware/rf_generator/__init__.py @@ -8,9 +8,8 @@ class RFGeneratorSCPI(SCPIinstr, RFGenerator): """ Do not instantiate directly, use rm = pyvisa.ResourceManager() - ScopeSCPI(rm.open_resource('TCPIP::192.168.0.2::INSTR')) + RFGeneratorSCPI(rm.open_resource('TCPIP::192.168.0.2::INSTR')) """ - pass def __init__(self, resource): SCPIinstr.__init__(self, resource) RFGenerator.__init__(self) diff --git a/qolab/hardware/scope/__init__.py b/qolab/hardware/scope/__init__.py index b89e2b6..c573edf 100644 --- a/qolab/hardware/scope/__init__.py +++ b/qolab/hardware/scope/__init__.py @@ -14,7 +14,6 @@ class Scope(BasicInstrument): def __init__(self): BasicInstrument.__init__(self) self.config['Device type']='Scope' - self.config['FnamePrefix'] = 'scope' self.config['Device model'] = 'Generic Scope Without Hardware interface' self.config['FnamePrefix'] = 'scope' self.numberOfChannels = 0 @@ -78,7 +77,6 @@ class ScopeSCPI(SCPIinstr, Scope): rm = pyvisa.ResourceManager() ScopeSCPI(rm.open_resource('TCPIP::192.168.0.2::INSTR')) """ - pass def __init__(self, resource): SCPIinstr.__init__(self, resource) Scope.__init__(self) |