From a46e34c199462c957e4755f3f8feeac895f64260 Mon Sep 17 00:00:00 2001
From: Arnaud Watlet <arnaud.watlet@umons.ac.be>
Date: Wed, 29 Nov 2023 12:41:34 +0100
Subject: [PATCH] tests new cabling config
---
ohmpi/hardware_components/mux_2023_0_X.py | 1 -
ohmpi/hardware_components/mux_2024_0_X.py | 1 -
ohmpi/hardware_system.py | 2 --
ohmpi/utils.py | 1 +
4 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/ohmpi/hardware_components/mux_2023_0_X.py b/ohmpi/hardware_components/mux_2023_0_X.py
index 786ad6e7..df4bd14d 100644
--- a/ohmpi/hardware_components/mux_2023_0_X.py
+++ b/ohmpi/hardware_components/mux_2023_0_X.py
@@ -86,7 +86,6 @@ class Mux(MuxAbstract):
self.exec_logger.error(f'Invalid role assignment for {self.model}: {self._roles} !')
self._mode = ''
cabling = kwargs.pop('cabling', None)
- print('cabling',cabling)
electrodes = kwargs.pop('electrodes', None)
self.cabling = {}
if cabling is None:
diff --git a/ohmpi/hardware_components/mux_2024_0_X.py b/ohmpi/hardware_components/mux_2024_0_X.py
index 7e722126..704e0a9c 100644
--- a/ohmpi/hardware_components/mux_2024_0_X.py
+++ b/ohmpi/hardware_components/mux_2024_0_X.py
@@ -83,7 +83,6 @@ class Mux(MuxAbstract):
self.exec_logger.error(f'Invalid role assignment for {self.model}: {self._roles} !')
self._mode = ''
cabling = kwargs.pop('cabling', None)
- print('cabling', cabling)
electrodes = kwargs.pop('electrodes', None)
self.cabling = {}
if cabling is None:
diff --git a/ohmpi/hardware_system.py b/ohmpi/hardware_system.py
index 5b5c418e..080fbd4c 100644
--- a/ohmpi/hardware_system.py
+++ b/ohmpi/hardware_system.py
@@ -157,7 +157,6 @@ class OhmPiHardware:
mux_config['id'] = mux_id
self.mux_boards[mux_id] = mux_module.Mux(**mux_config)
- print(self.mux_boards[mux_id].cabling)
self.mux_barrier = Barrier(len(self.mux_boards) + 1)
self._cabling = {}
@@ -165,7 +164,6 @@ class OhmPiHardware:
mux.barrier = self.mux_barrier
for k, v in mux.cabling.items():
update_dict(self._cabling, {k: (mux_id, k[0])}) #TODO: in theory k[0] is not needed in values
- print(self._cabling)
# Complete OhmPiHardware initialization
self.readings = np.array([]) # time series of acquired data
self._start_time = None # time of the beginning of a readings acquisition
diff --git a/ohmpi/utils.py b/ohmpi/utils.py
index 653d112d..7599b78b 100644
--- a/ohmpi/utils.py
+++ b/ohmpi/utils.py
@@ -135,6 +135,7 @@ def mux_2024_to_mux_2023_takeouts(mux_boards):
for mux in mux_boards:
new_cabling = mux.cabling.copy()
+ print(mux)
for k, v in mux.cabling.items():
print(k, v)
new_cabling[k] = (mapper[v[0]], v[1])
--
GitLab