Commit a46e34c1 authored by Arnaud WATLET's avatar Arnaud WATLET
Browse files

tests new cabling config

Showing with 1 addition and 4 deletions
+1 -4
...@@ -86,7 +86,6 @@ class Mux(MuxAbstract): ...@@ -86,7 +86,6 @@ class Mux(MuxAbstract):
self.exec_logger.error(f'Invalid role assignment for {self.model}: {self._roles} !') self.exec_logger.error(f'Invalid role assignment for {self.model}: {self._roles} !')
self._mode = '' self._mode = ''
cabling = kwargs.pop('cabling', None) cabling = kwargs.pop('cabling', None)
print('cabling',cabling)
electrodes = kwargs.pop('electrodes', None) electrodes = kwargs.pop('electrodes', None)
self.cabling = {} self.cabling = {}
if cabling is None: if cabling is None:
......
...@@ -83,7 +83,6 @@ class Mux(MuxAbstract): ...@@ -83,7 +83,6 @@ class Mux(MuxAbstract):
self.exec_logger.error(f'Invalid role assignment for {self.model}: {self._roles} !') self.exec_logger.error(f'Invalid role assignment for {self.model}: {self._roles} !')
self._mode = '' self._mode = ''
cabling = kwargs.pop('cabling', None) cabling = kwargs.pop('cabling', None)
print('cabling', cabling)
electrodes = kwargs.pop('electrodes', None) electrodes = kwargs.pop('electrodes', None)
self.cabling = {} self.cabling = {}
if cabling is None: if cabling is None:
......
...@@ -157,7 +157,6 @@ class OhmPiHardware: ...@@ -157,7 +157,6 @@ class OhmPiHardware:
mux_config['id'] = mux_id mux_config['id'] = mux_id
self.mux_boards[mux_id] = mux_module.Mux(**mux_config) 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.mux_barrier = Barrier(len(self.mux_boards) + 1)
self._cabling = {} self._cabling = {}
...@@ -165,7 +164,6 @@ class OhmPiHardware: ...@@ -165,7 +164,6 @@ class OhmPiHardware:
mux.barrier = self.mux_barrier mux.barrier = self.mux_barrier
for k, v in mux.cabling.items(): 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 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 # Complete OhmPiHardware initialization
self.readings = np.array([]) # time series of acquired data self.readings = np.array([]) # time series of acquired data
self._start_time = None # time of the beginning of a readings acquisition self._start_time = None # time of the beginning of a readings acquisition
......
...@@ -135,6 +135,7 @@ def mux_2024_to_mux_2023_takeouts(mux_boards): ...@@ -135,6 +135,7 @@ def mux_2024_to_mux_2023_takeouts(mux_boards):
for mux in mux_boards: for mux in mux_boards:
new_cabling = mux.cabling.copy() new_cabling = mux.cabling.copy()
print(mux)
for k, v in mux.cabling.items(): for k, v in mux.cabling.items():
print(k, v) print(k, v)
new_cabling[k] = (mapper[v[0]], v[1]) new_cabling[k] = (mapper[v[0]], v[1])
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment