diff options
| author | Eugeniy E. Mikhailov <evgmik@gmail.com> | 2022-06-14 22:55:36 -0400 |
|---|---|---|
| committer | Eugeniy E. Mikhailov <evgmik@gmail.com> | 2022-06-14 22:55:36 -0400 |
| commit | 8f105c24e5b42bb321daf2b66d5c3fedcebfb246 (patch) | |
| tree | 9bb3fd2df50b5d92b5c95751af34999d8b73ba1d /examples | |
| parent | e3a75169865ad47148586ad99b75ceffdd6345be (diff) | |
| download | qolab-8f105c24e5b42bb321daf2b66d5c3fedcebfb246.tar.gz qolab-8f105c24e5b42bb321daf2b66d5c3fedcebfb246.zip | |
proper inheritance of the parent deviceProperties
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/eit_with_vcsel.py | 2 | ||||
| -rw-r--r-- | examples/lock_eit.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/eit_with_vcsel.py b/examples/eit_with_vcsel.py index 03dbf34..ed0854e 100644 --- a/examples/eit_with_vcsel.py +++ b/examples/eit_with_vcsel.py @@ -46,7 +46,7 @@ class BfieldDriver(KeysightE3612A): super().__init__(*args, **kwds) self.config['Device type'] = 'B field coil driver based on Keysight E3612A power supply' self.config['Device model'] = 'v0.1' - self.deviceProperties = self.deviceProperties.union({'B', 'Bslope_TperA', 'CoilAssignment'}) + self.deviceProperties.update({'B', 'Bslope_TperA', 'CoilAssignment'}) """" Rough magnetic field calibration of the 3 axes coils in large magnetic shield - Ch1: 70mA -> 650 kHz shift for delta m = 2 diff --git a/examples/lock_eit.py b/examples/lock_eit.py index e6ba3a5..af3c894 100644 --- a/examples/lock_eit.py +++ b/examples/lock_eit.py @@ -359,13 +359,13 @@ async def main(): apparatus.runStatus = False error_signal_response_to_eit_detuning = BasicInstrument(device_nickname='.'.join([app_nickname, 'error_signal_response_to_eit_detuning']), tsdb_ingester=tsdb_ingester) - error_signal_response_to_eit_detuning.deviceProperties = {'conversion_factor', 'unit'} + error_signal_response_to_eit_detuning.deviceProperties.update({'conversion_factor', 'unit'}) error_signal_response_to_eit_detuning.conversion_factor = None error_signal_response_to_eit_detuning.unit = 'V_per_Hz' ai['error_signal_response_to_eit_detuning']=error_signal_response_to_eit_detuning B_control_voltage_to_eit_detuning = BasicInstrument(device_nickname='.'.join([app_nickname, 'B_control_voltage_to_eit_detuning']), tsdb_ingester=tsdb_ingester) - B_control_voltage_to_eit_detuning.deviceProperties = {'conversion_factor', 'unit'} + B_control_voltage_to_eit_detuning.deviceProperties.update({'conversion_factor', 'unit'}) B_control_voltage_to_eit_detuning.conversion_factor = None B_control_voltage_to_eit_detuning.unit = 'Hz_per_V' ai['B_control_voltage_to_eit_detuning'] = B_control_voltage_to_eit_detuning |