From 3909c9280887ab9f52d0df0fb569a68beae89c47 Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Sun, 23 Apr 2023 19:59:46 +0200
Subject: [PATCH] Fixes issue with RX, TX and MUX controller in OhmPiHardware
__init__
---
measure.py | 9 ++++++---
test_measure_with_ohmpi_card_3_15.py | 3 ++-
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/measure.py b/measure.py
index 16f968ef..7662f085 100644
--- a/measure.py
+++ b/measure.py
@@ -41,13 +41,16 @@ class OhmPiHardware:
soh_logger= self.soh_logger))
self.rx = kwargs.pop('rx', rx_module.Rx(exec_logger=self.exec_logger,
data_logger=self.data_logger,
- soh_logger=self.soh_logger))
+ soh_logger=self.soh_logger,
+ controller = self.controller))
self.tx = kwargs.pop('tx', tx_module.Tx(exec_logger=self.exec_logger,
data_logger=self.data_logger,
- soh_logger=self.soh_logger))
+ soh_logger=self.soh_logger,
+ controller=self.controller))
self.mux = kwargs.pop('mux', mux_module.Mux(exec_logger=self.exec_logger,
data_logger=self.data_logger,
- soh_logger=self.soh_logger))
+ soh_logger=self.soh_logger,
+ controller=self.controller))
self.readings = np.array([]) # time series of acquired data
self._start_time = None # time of the beginning of a readings acquisition
self._pulse = 0 # pulse number
diff --git a/test_measure_with_ohmpi_card_3_15.py b/test_measure_with_ohmpi_card_3_15.py
index 5924412b..378e328c 100644
--- a/test_measure_with_ohmpi_card_3_15.py
+++ b/test_measure_with_ohmpi_card_3_15.py
@@ -43,7 +43,8 @@ print(f'SP: {k.sp} mV')
r = ((k.readings[:,4]-k.readings[:,2]*k.sp)/k.readings[:,3])
print(f'Mean resistance with sp correction : {np.mean(r):.3f} Ohms, Dev. {100*np.std(r)/np.mean(r):.1f} %')
print('\nTesting with pulses')
-r = np.array([np.abs((k.pulses[i]['polarity']*k.pulses[i]['vmn']-k.sp)/k.pulses[i]['iab']) for i in k.pulses.keys()])
+r = [np.abs((k.pulses[i]['polarity']*k.pulses[i]['vmn']-k.sp)/k.pulses[i]['iab']) for i in k.pulses.keys()]
+print(r)
for i in range(len(r)):
print(f'Mean resistance with sp correction for pulse{i}: {np.mean(r[i]):.3f} Ohms, Dev. {100*np.std(r[i])/np.mean(r[i]):.1f} %')
change_config('config_default.py', verbose=False)
--
GitLab