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

Updates settings in ohmpi.py

Showing with 14 additions and 10 deletions
+14 -10
...@@ -168,6 +168,7 @@ class OhmPi(object): ...@@ -168,6 +168,7 @@ class OhmPi(object):
@staticmethod @staticmethod
def append_and_save(filename: str, last_measurement: dict, cmd_id=None): def append_and_save(filename: str, last_measurement: dict, cmd_id=None):
# TODO: find alternative approach to save full data (zip, hdf5 or mseed?)
"""Appends and saves the last measurement dict. """Appends and saves the last measurement dict.
Parameters Parameters
...@@ -454,18 +455,21 @@ class OhmPi(object): ...@@ -454,18 +455,21 @@ class OhmPi(object):
self.exec_logger.debug('Waiting for data') self.exec_logger.debug('Waiting for data')
# check arguments # check arguments
if quad is None: # if quad is None:
quad = [0, 0, 0, 0] # quad = [0, 0, 0, 0]
if nb_stack is None: # if nb_stack is None:
nb_stack = self.settings['nb_stack'] # nb_stack = self.settings['nb_stack']
if injection_duration is None: # if injection_duration is None:
injection_duration = self.settings['injection_duration'] # injection_duration = self.settings['injection_duration']
if duty_cycle is None: # if duty_cycle is None:
duty_cycle = self.settings['duty_cycle'] # duty_cycle = self.settings['duty_cycle']
tx_volt = float(tx_volt) quad = kwargs.pop('quad', [0,0,0,0])
nb_stack = kwargs.pop('nb_stack', self.settings['nb_stack'])
injection_duration = kwargs.pop('injection_duration', self.settings['injection_duration'])
duty_cycle = kwargs.pop('duty_cycle', self.settings['duty_cycle'])
tx_volt = float(kwargs.pop('duty_cycle', self.settings['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):
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) 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']
......
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