From 80c560b7c237ad2f871335f32394ddb1b88e981a Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Sat, 15 Apr 2023 18:44:39 +0200
Subject: [PATCH] Attemps to use the sampling_rate in _vab_pulse
---
measure.py | 8 ++++----
test_ohmpi_card_3_15.py | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/measure.py b/measure.py
index 42b175b0..a3167963 100644
--- a/measure.py
+++ b/measure.py
@@ -53,12 +53,12 @@ class OhmPiHardware:
def _vab_pulse(self, vab, length, sampling_rate=None, polarity=None):
""" Gets VMN and IAB from a single voltage pulse
"""
- def inject(duration):
+ def inject(self, duration):
self.tx_sync.set()
self.tx.voltage_pulse(length=duration)
self.tx_sync.clear()
- def read_values(sampling_rate): # noqa
+ def read_values(self, sampling_rate): # noqa
_readings = []
self.tx_sync.wait()
start_time = datetime.datetime.utcnow()
@@ -73,8 +73,8 @@ class OhmPiHardware:
if polarity is not None and polarity != self.tx.polarity:
self.tx.polarity = polarity
self.tx.voltage = vab
- injection = Thread(target=inject, kwargs={'duration':length})
- readings = Thread(target=read_values, kwargs={'sampling_rate': sampling_rate})
+ injection = Thread(target=inject, args=self, kwargs={'duration':length})
+ readings = Thread(target=read_values, args=self, kwargs={'sampling_rate': sampling_rate})
# set gains automatically
self.tx.adc_gain_auto()
self.rx.adc_gain_auto()
diff --git a/test_ohmpi_card_3_15.py b/test_ohmpi_card_3_15.py
index 66306084..5df2caf4 100644
--- a/test_ohmpi_card_3_15.py
+++ b/test_ohmpi_card_3_15.py
@@ -34,5 +34,5 @@ from utils import change_config
change_config('config_ohmpi_card_3_15.py', verbose=False)
k = OhmPiHardware()
-k._vab_pulse(vab=12, length=2., polarity=1)
+k._vab_pulse(vab=12, length=2., sampling_rate=20., polarity=1)
change_config('config_default.py', verbose=False)
\ No newline at end of file
--
GitLab