diff --git a/measure.py b/measure.py index 16f968ef76e276e24730478f0e4ccdf8a08519fc..7662f0850d9ed12876d1abf3106a1830128adbaa 100644 --- a/measure.py +++ b/measure.py @@ -41,13 +41,16 @@ class OhmPiHardware: soh_logger= self.soh_logger)) self.rx = kwargs.pop('rx', rx_module.Rx(exec_logger=self.exec_logger, data_logger=self.data_logger, - soh_logger=self.soh_logger)) + soh_logger=self.soh_logger, + controller = self.controller)) self.tx = kwargs.pop('tx', tx_module.Tx(exec_logger=self.exec_logger, data_logger=self.data_logger, - soh_logger=self.soh_logger)) + soh_logger=self.soh_logger, + controller=self.controller)) self.mux = kwargs.pop('mux', mux_module.Mux(exec_logger=self.exec_logger, data_logger=self.data_logger, - soh_logger=self.soh_logger)) + soh_logger=self.soh_logger, + controller=self.controller)) self.readings = np.array([]) # time series of acquired data self._start_time = None # time of the beginning of a readings acquisition self._pulse = 0 # pulse number diff --git a/test_measure_with_ohmpi_card_3_15.py b/test_measure_with_ohmpi_card_3_15.py index 5924412b172390c5ed6ed223a83aeeb190c41c7b..378e328c39410df6bbc07971d52dd7e1964026b0 100644 --- a/test_measure_with_ohmpi_card_3_15.py +++ b/test_measure_with_ohmpi_card_3_15.py @@ -43,7 +43,8 @@ print(f'SP: {k.sp} mV') r = ((k.readings[:,4]-k.readings[:,2]*k.sp)/k.readings[:,3]) print(f'Mean resistance with sp correction : {np.mean(r):.3f} Ohms, Dev. {100*np.std(r)/np.mean(r):.1f} %') print('\nTesting with pulses') -r = np.array([np.abs((k.pulses[i]['polarity']*k.pulses[i]['vmn']-k.sp)/k.pulses[i]['iab']) for i in k.pulses.keys()]) +r = [np.abs((k.pulses[i]['polarity']*k.pulses[i]['vmn']-k.sp)/k.pulses[i]['iab']) for i in k.pulses.keys()] +print(r) for i in range(len(r)): print(f'Mean resistance with sp correction for pulse{i}: {np.mean(r[i]):.3f} Ohms, Dev. {100*np.std(r[i])/np.mean(r[i]):.1f} %') change_config('config_default.py', verbose=False)