Commit 3e4ed80f authored by Olivier Kaufmann's avatar Olivier Kaufmann
Browse files

Addresses issue #101

Showing with 1 addition and 8 deletions
+1 -8
...@@ -47,7 +47,6 @@ class MuxAbstract(ABC): ...@@ -47,7 +47,6 @@ class MuxAbstract(ABC):
self.exec_logger.debug(f'MUX {self.board_id} ({self.board_name}) initialization') self.exec_logger.debug(f'MUX {self.board_id} ({self.board_name}) initialization')
self.controller = kwargs.pop('controller', None) self.controller = kwargs.pop('controller', None)
cabling = kwargs.pop('cabling', None) cabling = kwargs.pop('cabling', None)
print(f'cabling: {cabling}')
self.cabling = {} self.cabling = {}
if cabling is not None: if cabling is not None:
for k, v in cabling.items(): for k, v in cabling.items():
......
...@@ -110,9 +110,6 @@ class Mux(MuxAbstract): ...@@ -110,9 +110,6 @@ class Mux(MuxAbstract):
d = inner_cabling[self._mode] d = inner_cabling[self._mode]
self.addresses = {} self.addresses = {}
for k, v in d.items(): 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}) self.addresses.update({self.cabling[(k[0], self._roles[k[1]])]: v})
print(f'addresses: {self.addresses}') print(f'addresses: {self.addresses}')
......
...@@ -113,7 +113,6 @@ class OhmPiHardware: ...@@ -113,7 +113,6 @@ class OhmPiHardware:
mean_iab.append(np.mean(self.readings[self.readings[:, 1] == i, 3])) mean_iab.append(np.mean(self.readings[self.readings[:, 1] == i, 3]))
mean_vmn = np.array(mean_vmn) mean_vmn = np.array(mean_vmn)
mean_iab = np.array(mean_iab) 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 sp = np.mean(mean_vmn[np.ix_(polarity==1)] - mean_vmn[np.ix_(polarity==-1)]) / 2
return sp return sp
...@@ -196,8 +195,7 @@ class OhmPiHardware: ...@@ -196,8 +195,7 @@ class OhmPiHardware:
def vab_square_wave(self, vab, cycle_length, sampling_rate, cycles=3, polarity=1, append=False): def vab_square_wave(self, vab, cycle_length, sampling_rate, cycles=3, polarity=1, append=False):
self.tx.polarity = polarity self.tx.polarity = polarity
lengths = [cycle_length/2]*2*cycles # TODO: delete me lengths = [cycle_length/2]*2*cycles
print(f'vab_square_wave lengths: {lengths}')
self._vab_pulses(vab, lengths, sampling_rate, append=append) self._vab_pulses(vab, lengths, sampling_rate, append=append)
def _vab_pulse(self, vab, length, sampling_rate=None, polarity=None, append=False): def _vab_pulse(self, vab, length, sampling_rate=None, polarity=None, append=False):
...@@ -229,6 +227,5 @@ class OhmPiHardware: ...@@ -229,6 +227,5 @@ class OhmPiHardware:
polarities = [-self.tx.polarity * np.heaviside(i % 2, -1.) for i in range(n_pulses)] polarities = [-self.tx.polarity * np.heaviside(i % 2, -1.) for i in range(n_pulses)]
if not append: if not append:
self._clear_values() self._clear_values()
print(f'Polarities: {polarities}, sampling_rate: {sampling_rate}') # TODO: delete me
for i in range(n_pulses): for i in range(n_pulses):
self._vab_pulse(self, length=lengths[i], sampling_rate=sampling_rate, polarity=polarities[i], append=True) self._vab_pulse(self, length=lengths[i], sampling_rate=sampling_rate, polarity=polarities[i], append=True)
\ No newline at end of file
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