aboutsummaryrefslogtreecommitdiff
path: root/qolab/hardware/lockin/__init__.py
diff options
context:
space:
mode:
authorEugeniy E. Mikhailov <evgmik@gmail.com>2022-06-14 22:55:36 -0400
committerEugeniy E. Mikhailov <evgmik@gmail.com>2022-06-14 22:55:36 -0400
commit8f105c24e5b42bb321daf2b66d5c3fedcebfb246 (patch)
tree9bb3fd2df50b5d92b5c95751af34999d8b73ba1d /qolab/hardware/lockin/__init__.py
parente3a75169865ad47148586ad99b75ceffdd6345be (diff)
downloadqolab-8f105c24e5b42bb321daf2b66d5c3fedcebfb246.tar.gz
qolab-8f105c24e5b42bb321daf2b66d5c3fedcebfb246.zip
proper inheritance of the parent deviceProperties
Diffstat (limited to 'qolab/hardware/lockin/__init__.py')
-rw-r--r--qolab/hardware/lockin/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/qolab/hardware/lockin/__init__.py b/qolab/hardware/lockin/__init__.py
index e6dc75b..ab862cb 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.update({'FreqInt', 'FreqExt', 'Harm', 'SinAmpl', 'SinOffset',
'RefPhase',
- 'Sensitivity', 'TimeConstan', 'FilterSlope', 'EquivalentNoiseBW'};
+ 'Sensitivity', 'TimeConstan', 'FilterSlope', 'EquivalentNoiseBW'})
# Minimal set of methods to be implemented.
pass