Commit e34fb4e1 authored by Olivier Kaufmann's avatar Olivier Kaufmann
Browse files

Searches for run_measurement error

Showing with 4 additions and 3 deletions
+4 -3
...@@ -400,10 +400,10 @@ class OhmPiHardware: ...@@ -400,10 +400,10 @@ class OhmPiHardware:
def vab_square_wave(self, vab, cycle_duration, sampling_rate=None, cycles=3, polarity=1, duty_cycle=1., def vab_square_wave(self, vab, cycle_duration, sampling_rate=None, cycles=3, polarity=1, duty_cycle=1.,
append=False): append=False):
self.exec_logger.event(f'OhmPiHardware\tvab_square_wave\tbegin\t{datetime.datetime.utcnow()}') self.exec_logger.event(f'OhmPiHardware\tvab_square_wave\tbegin\t{datetime.datetime.utcnow()}')
# self._gain_auto() # TODO: Uncomment me self._gain_auto()
assert 0. <= duty_cycle <= 1. assert 0. <= duty_cycle <= 1.
if duty_cycle < 1.: if duty_cycle < 1.:
durations = [cycle_duration/2 * duty_cycle, cycle_duration/2*(1.-duty_cycle)] * 2 * cycles durations = [cycle_duration/2 * duty_cycle, cycle_duration/2 * (1.-duty_cycle)] * 2 * cycles
pol = [-int(polarity * np.heaviside(i % 2, -1.)) for i in range(2 * cycles)] pol = [-int(polarity * np.heaviside(i % 2, -1.)) for i in range(2 * cycles)]
# pol = [-int(self.tx.polarity * np.heaviside(i % 2, -1.)) for i in range(2 * cycles)] # pol = [-int(self.tx.polarity * np.heaviside(i % 2, -1.)) for i in range(2 * cycles)]
polarities = [0] * (len(pol) * 2) polarities = [0] * (len(pol) * 2)
......
...@@ -456,7 +456,8 @@ class OhmPi(object): ...@@ -456,7 +456,8 @@ class OhmPi(object):
tx_volt = float(tx_volt) tx_volt = float(tx_volt)
bypass_check = kwargs['bypass_check'] if 'bypass_check' in kwargs.keys() else False 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): if self.switch_mux_on(quad, bypass_check=bypass_check, cmd_id=cmd_id):
self._hw.vab_square_wave(tx_volt, cycle_duration=injection_duration*2, cycles=nb_stack, duty_cycle=kwargs.pop('duty_cycle', 1.)) duty_cycle = kwargs.pop('duty_cycle', 1.)
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(): if 'delay' in kwargs.keys():
delay = kwargs['delay'] delay = kwargs['delay']
else: else:
......
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