aboutsummaryrefslogtreecommitdiff
path: root/qolab/feedback
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/feedback
parente3a75169865ad47148586ad99b75ceffdd6345be (diff)
downloadqolab-8f105c24e5b42bb321daf2b66d5c3fedcebfb246.tar.gz
qolab-8f105c24e5b42bb321daf2b66d5c3fedcebfb246.zip
proper inheritance of the parent deviceProperties
Diffstat (limited to 'qolab/feedback')
-rw-r--r--qolab/feedback/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/qolab/feedback/__init__.py b/qolab/feedback/__init__.py
index e6785fc..e2dc3c0 100644
--- a/qolab/feedback/__init__.py
+++ b/qolab/feedback/__init__.py
@@ -7,7 +7,7 @@ class PID(BasicInstrument):
self.config['Device model'] = 'Generic Software PID loop'
self.config['Device type']='PID loop'
self.config['FnamePrefix'] = 'pid'
- self.deviceProperties = {'Gp', 'Gi', 'Gd', 'Sign', 'Enable'};
+ self.deviceProperties.update({'Gp', 'Gi', 'Gd', 'Sign', 'Enable'})
self.setGp(Gp)
self.setGi(Gi)
self.setGd(Gd)