diff options
| author | Eugeniy E. Mikhailov <evgmik@gmail.com> | 2022-01-03 23:23:47 -0500 |
|---|---|---|
| committer | Eugeniy E. Mikhailov <evgmik@gmail.com> | 2022-01-03 23:23:47 -0500 |
| commit | 82ae4d4c87b2a3692f2f9927028326d251da1da5 (patch) | |
| tree | b592f546a05f6fd2ce9f59e53eabfff4dd5e619f /qolab/hardware/rf_generator | |
| parent | 56e341a9812840c4c511de110fb405ba596df1a9 (diff) | |
| download | pyExpControl-82ae4d4c87b2a3692f2f9927028326d251da1da5.tar.gz pyExpControl-82ae4d4c87b2a3692f2f9927028326d251da1da5.zip | |
using set
Diffstat (limited to 'qolab/hardware/rf_generator')
| -rw-r--r-- | qolab/hardware/rf_generator/__init__.py | 2 | ||||
| -rw-r--r-- | qolab/hardware/rf_generator/agilent_e8257d.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/qolab/hardware/rf_generator/__init__.py b/qolab/hardware/rf_generator/__init__.py index 3064c54..6de404a 100644 --- a/qolab/hardware/rf_generator/__init__.py +++ b/qolab/hardware/rf_generator/__init__.py @@ -8,7 +8,7 @@ class RFGenerator(BasicInstrument): self.config['Device type']='RFGenerator' self.config['Device model'] = 'Generic RF generator Without Hardware interface' self.config['FnamePrefix'] = 'rfgen' - self.deviceProperties = ['FreqFixed', ] + self.deviceProperties = {'FreqFixed', } class RFGeneratorSCPI(SCPIinstr, RFGenerator): """ diff --git a/qolab/hardware/rf_generator/agilent_e8257d.py b/qolab/hardware/rf_generator/agilent_e8257d.py index 7d05c0b..f13ff72 100644 --- a/qolab/hardware/rf_generator/agilent_e8257d.py +++ b/qolab/hardware/rf_generator/agilent_e8257d.py @@ -10,7 +10,7 @@ class AgilentE8257D(RFGeneratorSCPI): super().__init__(resource, *args, **kwds) self.resource.read_termination='\n' self.config['Device model'] = 'Agilent E8257D' - self.deviceProperties.extend([ + self.deviceProperties.update({ 'RFPowerState', 'RFAmplitude', 'ModulationState', @@ -22,7 +22,7 @@ class AgilentE8257D(RFGeneratorSCPI): 'FM2ModulationDepth', 'FrequencyMode', # sweep or continious 'SweepCentralFreq', 'SweepSpan', - ]) + }) """ Note: Fixed frequency and Center frequency (of sweep) are different in this model """ |