From 75e3cda03119c43992d3a9b3556784d2d8f3ef6e Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Wed, 18 Oct 2023 21:24:38 +0200
Subject: [PATCH] Adds compute_tx_volt in run_measurement
---
ohmpi/hardware_system.py | 1 +
ohmpi/ohmpi.py | 1 +
2 files changed, 2 insertions(+)
diff --git a/ohmpi/hardware_system.py b/ohmpi/hardware_system.py
index 283001d5..bf862fb2 100644
--- a/ohmpi/hardware_system.py
+++ b/ohmpi/hardware_system.py
@@ -602,6 +602,7 @@ class OhmPiHardware:
# if self.tx.pwr.pwr_state == 'off':
# self.tx.pwr.pwr_state = 'on'
# switch_pwr_off = True
+
self._gain_auto(vab=vab)
assert 0. <= duty_cycle <= 1.
if duty_cycle < 1.:
diff --git a/ohmpi/ohmpi.py b/ohmpi/ohmpi.py
index c9df403f..a20908f1 100644
--- a/ohmpi/ohmpi.py
+++ b/ohmpi/ohmpi.py
@@ -491,6 +491,7 @@ class OhmPi(object):
# 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):
+ tx_volt = self._hw._compute_tx_volt(tx_volt=tx_volt, strategy=strategy)
self._hw.vab_square_wave(tx_volt, cycle_duration=injection_duration*2/duty_cycle, cycles=nb_stack, duty_cycle=duty_cycle)
if 'delay' in kwargs.keys():
delay = kwargs['delay']
--
GitLab