Updates mux_2024 specs handling

a03ce9c7 · Olivier Kaufmann · 401c7e26 · a03ce9c7
Commit a03ce9c7 authored 1 year ago by Olivier Kaufmann
Hide whitespace changes
Inline Side-by-side

Showing

with 4 additions and 4 deletions
+4 -4
--- a/ohmpi/hardware_components/mux_2024_rev_0_0.py
+++ b/ohmpi/hardware_components/mux_2024_rev_0_0.py
@@ -14,11 +14,11 @@ activation_delay = 0.01
 release_delay = 0.005
 MUX_CONFIG = HARDWARE_CONFIG['mux'].pop('default', {})
-MUX_CONFIG.update({'voltage_max': max(0,min(MUX_CONFIG['voltage_max'],voltage_max)),
+MUX_CONFIG.update({'voltage_max': max(0.,min(MUX_CONFIG['voltage_max'],voltage_max)),
-                   'current_max': max(0,min(MUX_CONFIG['current_max'],voltage_max))})
+                   'current_max': max(0.,min(MUX_CONFIG['current_max'],voltage_max))})
-MUX_CONFIG.update({'activation_delay': max(MUX_CONFIG['activation_delay'],activation_delay),
+MUX_CONFIG.update({'activation_delay': max(MUX_CONFIG.pop('activation_delay', activation_delay),activation_delay),
-                   'release_delay': max(MUX_CONFIG['release_delay'],release_delay)})
+                   'release_delay': max(MUX_CONFIG.pop('release_delay', release_delay),release_delay)})
 # defaults to 4 roles cabling electrodes from 1 to 8
 default_mux_cabling = {(elec, role) : ('mux_1', elec) for role in ['A', 'B', 'M', 'N'] for elec in range(1,9)}