From 0a59411cd014c6a64b4ad663e5b387756d91725b Mon Sep 17 00:00:00 2001
From: awatlet <arnaud.watlet@umons.ac.be>
Date: Mon, 16 Oct 2023 18:26:12 +0200
Subject: [PATCH] Fixes settings run_measurement
---
ohmpi/ohmpi.py | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/ohmpi/ohmpi.py b/ohmpi/ohmpi.py
index 135cf0cb..ea0b3e2b 100644
--- a/ohmpi/ohmpi.py
+++ b/ohmpi/ohmpi.py
@@ -455,19 +455,19 @@ class OhmPi(object):
self.exec_logger.debug('Waiting for data')
# check arguments
- # if quad is None:
- # quad = [0, 0, 0, 0]
- # if nb_stack is None:
- # nb_stack = self.settings['nb_stack']
- # if injection_duration is None:
- # injection_duration = self.settings['injection_duration']
- # if duty_cycle is None:
- # duty_cycle = self.settings['duty_cycle']
- quad = kwargs.pop('quad', [0,0,0,0])
- nb_stack = kwargs.pop('nb_stack', self.settings['nb_stack'])
- injection_duration = kwargs.pop('injection_duration', self.settings['injection_duration'])
- duty_cycle = kwargs.pop('duty_cycle', self.settings['duty_cycle'])
- tx_volt = float(kwargs.pop('duty_cycle', self.settings['tx_volt']))
+ if quad is None:
+ quad = [0, 0, 0, 0]
+ if nb_stack is None:
+ nb_stack = self.settings['nb_stack']
+ if injection_duration is None:
+ injection_duration = self.settings['injection_duration']
+ if duty_cycle is None:
+ duty_cycle = self.settings['duty_cycle']
+ # quad = kwargs.pop('quad', [0,0,0,0])
+ # nb_stack = kwargs.pop('nb_stack', self.settings['nb_stack'])
+ # injection_duration = kwargs.pop('injection_duration', self.settings['injection_duration'])
+ # duty_cycle = kwargs.pop('duty_cycle', self.settings['duty_cycle'])
+ # tx_volt = float(kwargs.pop('tx_volt', self.settings['tx_volt']))
bypass_check = kwargs['bypass_check'] if 'bypass_check' in kwargs.keys() else False
if self.switch_mux_on(quad, bypass_check=bypass_check, cmd_id=cmd_id):
self._hw.vab_square_wave(tx_volt, cycle_duration=injection_duration*2/duty_cycle, cycles=nb_stack, duty_cycle=duty_cycle)
--
GitLab