diff --git a/ohmpi/hardware_system.py b/ohmpi/hardware_system.py index 99327646bf8543806160b8c97af81d85f212814b..a1a7db8eff3655ba943a180b7c387c180b236c48 100644 --- a/ohmpi/hardware_system.py +++ b/ohmpi/hardware_system.py @@ -495,7 +495,7 @@ class OhmPiHardware: injection.join() v = np.where((self.readings[:, 0] > delay) & (self.readings[:, 2] != 0))[0] # NOTE : discard data aquired in the first x ms iab = self.readings[v, 3] - vmn = self.readings[v, 4] * self.readings[v, 2] + vmn = self.readings[v, 4]/1000. * self.readings[v, 2] iab_mean = np.mean(iab) iab_std = np.std(iab) vmn_mean = np.mean(vmn) diff --git a/ohmpi/ohmpi.py b/ohmpi/ohmpi.py index 7557960762b99b03216ada12ac42aa2e18263b9d..b18f4406ef57882e7d3d82cf48e0d7141a84a7da 100644 --- a/ohmpi/ohmpi.py +++ b/ohmpi/ohmpi.py @@ -491,7 +491,7 @@ class OhmPi(object): # tx_volt = float(kwargs.pop('tx_volt', self.settings['tx_volt'])) bypass_check = kwargs['bypass_check'] if 'bypass_check' in kwargs.keys() else False if self.switch_mux_on(quad, bypass_check=bypass_check, cmd_id=cmd_id): - # tx_volt,_ ,_ = self._hw._compute_tx_volt(tx_volt=tx_volt, strategy=strategy) + tx_volt,_ ,_ = self._hw._compute_tx_volt(tx_volt=tx_volt, strategy=strategy) self._hw.vab_square_wave(tx_volt, cycle_duration=injection_duration*2/duty_cycle, cycles=nb_stack, duty_cycle=duty_cycle) if 'delay' in kwargs.keys(): delay = kwargs['delay']