From 8956156ef0bb79dfc3cfb8a730409aba90b5fe10 Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Thu, 21 Sep 2023 17:46:07 +0200
Subject: [PATCH] Handle duty_cycle argument within ohmpi run_measurement
---
ohmpi/hardware_system.py | 2 +-
ohmpi/ohmpi.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ohmpi/hardware_system.py b/ohmpi/hardware_system.py
index 1996b5e9..38fc63fa 100644
--- a/ohmpi/hardware_system.py
+++ b/ohmpi/hardware_system.py
@@ -207,7 +207,7 @@ class OhmPiHardware:
v = self.readings[:, 2] != 0
if len(v) > 1:
# return np.mean(np.abs(self.readings[v, 4] - self.sp) / self.readings[v, 3])
- return np.mean((self.readings[v, 2] * self.readings[v, 4] - self.sp) / self.readings[v, 3])
+ return np.mean(self.readings[v, 2] * (self.readings[v, 4] - self.sp) / self.readings[v, 3])
else:
return np.nan
diff --git a/ohmpi/ohmpi.py b/ohmpi/ohmpi.py
index 725bc99d..54e3b23c 100644
--- a/ohmpi/ohmpi.py
+++ b/ohmpi/ohmpi.py
@@ -453,7 +453,7 @@ class OhmPi(object):
tx_volt = float(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, cycles=nb_stack)
+ self._hw.vab_square_wave(tx_volt, cycle_duration=injection_duration*2, cycles=nb_stack, duty_cycle=kwargs.pop('duty_cycle', 1.))
if 'delay' in kwargs.keys():
delay = kwargs['delay']
else:
--
GitLab