From 1748fc09a9c60f6bfd4e45ef5db39201ac8639ab Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Tue, 10 Oct 2023 17:15:15 +0200
Subject: [PATCH] Uses self._hw values for R and dev
---
ohmpi/hardware_components/mb_2023_0_X.py | 2 --
ohmpi/hardware_components/mb_2024_0_2.py | 1 -
ohmpi/hardware_system.py | 1 +
3 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/ohmpi/hardware_components/mb_2023_0_X.py b/ohmpi/hardware_components/mb_2023_0_X.py
index 48849b9c..1b67160b 100644
--- a/ohmpi/hardware_components/mb_2023_0_X.py
+++ b/ohmpi/hardware_components/mb_2023_0_X.py
@@ -159,7 +159,6 @@ class Tx(TxAbstract):
assert polarity in [-1, 0, 1]
self._polarity = polarity
if polarity == 1:
- print('pin0')
self.pin0.value = True
self.pin1.value = False
time.sleep(self._activation_delay)
@@ -203,7 +202,6 @@ class Tx(TxAbstract):
if voltage is not None:
self.pwr.voltage = voltage
self.exec_logger.debug(f'Voltage pulse of {polarity*self.pwr.voltage:.3f} V for {length:.3f} s')
- print('inject_mb', polarity)
self.inject(polarity=polarity, injection_duration=length)
self.exec_logger.event(f'{self.board_name}\ttx_voltage_pulse\tend\t{datetime.datetime.utcnow()}')
diff --git a/ohmpi/hardware_components/mb_2024_0_2.py b/ohmpi/hardware_components/mb_2024_0_2.py
index 5a5b6b48..9bb65d72 100644
--- a/ohmpi/hardware_components/mb_2024_0_2.py
+++ b/ohmpi/hardware_components/mb_2024_0_2.py
@@ -143,5 +143,4 @@ class Rx(Rx_mb_2023):
self.exec_logger.event(f'{self.board_name}\trx_voltage\tbegin\t{datetime.datetime.utcnow()}')
u = (AnalogIn(self._ads_voltage, ads.P0).voltage * self._coef_p2 * 1000. - self._vmn_hardware_offset) / self._dg411_gain - self._bias # TODO: check how to handle bias and _vmn_hardware_offset
self.exec_logger.event(f'{self.board_name}\trx_voltage\tend\t{datetime.datetime.utcnow()}')
- print(f'voltage: {u}')
return u
diff --git a/ohmpi/hardware_system.py b/ohmpi/hardware_system.py
index 6ca62794..4db9b8ad 100644
--- a/ohmpi/hardware_system.py
+++ b/ohmpi/hardware_system.py
@@ -270,6 +270,7 @@ class OhmPiHardware:
def last_dev(self, delay=0.):
v = np.where((self.readings[:, 0] >= delay) & (self.readings[:, 2] != 0))
+ print(v)
if len(v) > 1:
return 100. * np.std(self.readings[v, 2] * (self.readings[v, 4] - self.sp) / self.readings[v, 3]) / self.last_resistance
else:
--
GitLab