From 034baa3d1dd246f9f4730c79f953a3d520d8bcd2 Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Sat, 15 Apr 2023 19:10:51 +0200
Subject: [PATCH] Attemps to use the sampling_rate in _vab_pulse
---
hardware/abstract_hardware.py | 1 -
measure.py | 9 +++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hardware/abstract_hardware.py b/hardware/abstract_hardware.py
index 881c9bea..23d20c49 100644
--- a/hardware/abstract_hardware.py
+++ b/hardware/abstract_hardware.py
@@ -17,7 +17,6 @@ class TxAbstract(ABC):
if polarity is None:
polarity = 0
self._polarity = polarity
- print(f'polarity: {polarity}') # TODO: delete me
inj_time = kwargs.pop('inj_time', 1.)
self.exec_logger = kwargs.pop('exec_logger', None)
if self.exec_logger is None:
diff --git a/measure.py b/measure.py
index 1c5a00b9..a0544900 100644
--- a/measure.py
+++ b/measure.py
@@ -58,7 +58,7 @@ class OhmPiHardware:
self.tx.voltage_pulse(length=duration)
self.tx_sync.clear()
- def read_values(self, sampling_rate): # noqa
+ def read_values(self, data, sampling_rate): # noqa
_readings = []
self.tx_sync.wait()
start_time = datetime.datetime.utcnow()
@@ -66,19 +66,20 @@ class OhmPiHardware:
lap = datetime.datetime.utcnow()
_readings.append([elapsed_seconds(start_time), self.tx.current, self.rx.voltage])
time.sleep(sampling_rate/1000.-elapsed_seconds(lap))
- return np.array(_readings)
+ data = np.array(_readings)
if sampling_rate is None:
sampling_rate = RX_CONFIG['sampling_rate']
if polarity is not None and polarity != self.tx.polarity:
self.tx.polarity = polarity
self.tx.voltage = vab
+ data = np.ndarray()
injection = Thread(target=inject, args=[self], kwargs={'duration':length})
- readings = Thread(target=read_values, args=[self], kwargs={'sampling_rate': sampling_rate})
+ readings = Thread(target=read_values, args=[self, data], kwargs={'sampling_rate': sampling_rate})
# set gains automatically
self.tx.adc_gain_auto()
self.rx.adc_gain_auto()
- data = readings.start()
+ readings.start()
injection.start()
readings.join()
injection.join()
--
GitLab