From 3e4ed80f7824069ddc8c97310788b5c890b0efa5 Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Thu, 27 Apr 2023 20:36:51 +0200
Subject: [PATCH] Addresses issue #101
---
hardware_components/abstract_hardware_components.py | 1 -
hardware_components/mux_2024_rev_0_0.py | 3 ---
hardware_system.py | 5 +----
3 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/hardware_components/abstract_hardware_components.py b/hardware_components/abstract_hardware_components.py
index 0a6dce50..f9b95759 100644
--- a/hardware_components/abstract_hardware_components.py
+++ b/hardware_components/abstract_hardware_components.py
@@ -47,7 +47,6 @@ class MuxAbstract(ABC):
self.exec_logger.debug(f'MUX {self.board_id} ({self.board_name}) initialization')
self.controller = kwargs.pop('controller', None)
cabling = kwargs.pop('cabling', None)
- print(f'cabling: {cabling}')
self.cabling = {}
if cabling is not None:
for k, v in cabling.items():
diff --git a/hardware_components/mux_2024_rev_0_0.py b/hardware_components/mux_2024_rev_0_0.py
index d888744f..fe5ec7e6 100644
--- a/hardware_components/mux_2024_rev_0_0.py
+++ b/hardware_components/mux_2024_rev_0_0.py
@@ -110,9 +110,6 @@ class Mux(MuxAbstract):
d = inner_cabling[self._mode]
self.addresses = {}
for k, v in d.items():
- #print(f'self.cabling: {self.cabling}, k: {k}, self._roles: {self._roles}, d: {d}')
- print(f'self.cabling[k[0]]: {self.cabling[(k[0], self._roles[k[1]])]}')
- print(f'self._roles[k[1]]: {self._roles[k[1]]}')
self.addresses.update({self.cabling[(k[0], self._roles[k[1]])]: v})
print(f'addresses: {self.addresses}')
diff --git a/hardware_system.py b/hardware_system.py
index 81b9a0ac..56c6774f 100644
--- a/hardware_system.py
+++ b/hardware_system.py
@@ -113,7 +113,6 @@ class OhmPiHardware:
mean_iab.append(np.mean(self.readings[self.readings[:, 1] == i, 3]))
mean_vmn = np.array(mean_vmn)
mean_iab = np.array(mean_iab)
- # print(f'Vmn: {mean_vmn}, Iab: {mean_iab}') # TODO: delete me
sp = np.mean(mean_vmn[np.ix_(polarity==1)] - mean_vmn[np.ix_(polarity==-1)]) / 2
return sp
@@ -196,8 +195,7 @@ class OhmPiHardware:
def vab_square_wave(self, vab, cycle_length, sampling_rate, cycles=3, polarity=1, append=False):
self.tx.polarity = polarity
- lengths = [cycle_length/2]*2*cycles # TODO: delete me
- print(f'vab_square_wave lengths: {lengths}')
+ lengths = [cycle_length/2]*2*cycles
self._vab_pulses(vab, lengths, sampling_rate, append=append)
def _vab_pulse(self, vab, length, sampling_rate=None, polarity=None, append=False):
@@ -229,6 +227,5 @@ class OhmPiHardware:
polarities = [-self.tx.polarity * np.heaviside(i % 2, -1.) for i in range(n_pulses)]
if not append:
self._clear_values()
- print(f'Polarities: {polarities}, sampling_rate: {sampling_rate}') # TODO: delete me
for i in range(n_pulses):
self._vab_pulse(self, length=lengths[i], sampling_rate=sampling_rate, polarity=polarities[i], append=True)
\ No newline at end of file
--
GitLab