diff options
Diffstat (limited to 'qolab/hardware/lockin')
| -rw-r--r-- | qolab/hardware/lockin/__init__.py | 4 | ||||
| -rw-r--r-- | qolab/hardware/lockin/srs_sr865a.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/qolab/hardware/lockin/__init__.py b/qolab/hardware/lockin/__init__.py index 125e307..e6dc75b 100644 --- a/qolab/hardware/lockin/__init__.py +++ b/qolab/hardware/lockin/__init__.py @@ -8,9 +8,9 @@ class Lockin(BasicInstrument): self.config['FnamePrefix'] = 'lockin' self.config['Device model'] = 'Generic Lockin Without Hardware interface' self.config['FnamePrefix'] = 'lockin' - self.deviceProperties = ['FreqInt', 'FreqExt', 'Harm', 'SinAmpl', 'SinOffset', + self.deviceProperties = {'FreqInt', 'FreqExt', 'Harm', 'SinAmpl', 'SinOffset', 'RefPhase', - 'Sensitivity', 'TimeConstan', 'FilterSlope', 'EquivalentNoiseBW']; + 'Sensitivity', 'TimeConstan', 'FilterSlope', 'EquivalentNoiseBW'}; # Minimal set of methods to be implemented. pass diff --git a/qolab/hardware/lockin/srs_sr865a.py b/qolab/hardware/lockin/srs_sr865a.py index 968a301..a85d47f 100644 --- a/qolab/hardware/lockin/srs_sr865a.py +++ b/qolab/hardware/lockin/srs_sr865a.py @@ -8,7 +8,7 @@ class SRS_SR865A(LockinSCPI): super().__init__(resource, *args, **kwds) self.config['Device model']='SRS SR865A' self.resource.read_termination='\n' - self.deviceProperties.extend(['TimeBaseMode', 'AuxOut1', 'AuxOut2', 'AuxOut3', 'AuxOut4']) + self.deviceProperties.update({'TimeBaseMode', 'AuxOut1', 'AuxOut2', 'AuxOut3', 'AuxOut4'}) FreqInt = SCPI_PROPERTY(scpi_prfx='FreqInt', ptype=float, doc='Internal LO frequency') FreqExt = SCPI_PROPERTY(scpi_prfx='FreqExt', ptype=float, doc='External LO frequency', no_setter=True) |