Fixes and formatting

Author: rassouly

exopy_hqc_legacy/instruments/drivers/visa/tektro_awg.py

@@ -506,10 +506,10 @@ def send_load_awg_file(self, awg_data, filename='setup'):
 
         """
         name_str = 'MMEMory:DATA "{}",'.format(filename+'.awg')
-        size_str = ('#' + str(len(str(len(awg_file)))) + str(len(awg_file)))
+        size_str = ('#' + str(len(str(len(awg_data)))) + str(len(awg_data)))
         mes = name_str + size_str
         self.write('MMEMory:CDIRectory "/Users/OEM/Documents"')
-        self._driver.write_raw(mes.encode('ASCII') + awg_file)
+        self._driver.write_raw(mes.encode('ASCII') + awg_data)
         self.write('AWGCONTROL:SRESTORE "{}"'.format(filename+'.awg'))
 
     @secure_communication()
@@ -548,14 +548,14 @@ def ask_sequencer_pos(self):
         """Ask the current position index of the sequencer
 
         """
-        return self.ask('AWGC:SEQ:POS?')
+        return self.query('AWGC:SEQ:POS?')
 
     @secure_communication()
     def force_jump_to(self, pos):
         """Make the sequencer jump to position pos
 
         """
-        self.ask('SEQUENCE:JUMP:IMMEDIATE {}'.format(pos))
+        self.query('SEQUENCE:JUMP:IMMEDIATE {}'.format(pos))
 
     @secure_communication()
     def set_repeat(self, position, repeat):
@@ -730,10 +730,8 @@ def set_running(self, value, delay=0.0):
         self.clear_output_buffer()
         if value in ('RUN', 1, 'True', True):
             self.write('AWGC:RUN:IMM')
-            self.write('AWGC:RST?')
-            time.sleep(delay)
-            values = self.read_values(format=2)
-            if values[0] not in (1, 2):
+            run_mode = int(self.query('AWGC:RST?', delay=delay))
+            if run_mode not in (1, 2):
                 raise InstrIOError(cleandoc('''Instrument did not set
                                             correctly the run state'''))
         elif value in ('STOP', 0, 'False', False):
@@ -753,12 +751,12 @@ def running(self):
 
         """
         self.clear_output_buffer()
-        run = self.ask_for_values("AWGC:RST?")[0]
-        if run == 0:
+        running = int(self.query("AWGC:RST?"))
+        if running == 0:
             return False
-        if run == 1 or run == 2:
+        if running == 1 or running == 2:
             return True
-        raise InstrIOError
+        raise InstrIOError(cleandoc('''Couldn't read the run mode'''))
 
     @instrument_property
     @secure_communication()
@@ -811,14 +809,14 @@ def delete_all_waveforms(self):
         try:
             # Number of user defined waveforms
             # 25 is the number of default waveforms
-            nb_waveforms = int(self.ask("WLIST:SIZE?")) - 25
+            nb_waveforms = int(self.query("WLIST:SIZE?")) - 25
         except Exception:
             nb_waveforms = 0
-        wait_time = 1+int(nb_waveforms/120)
+        wait_time = 1 + int(nb_waveforms / 120)
         self.write('WLIST:WAVEFORM:DELETE ALL')
 
-        logging.info('Waiting {}s for {} waveforms to be deleted'.format(wait_time,
-                                                                         nb_waveforms))
+        msg = 'Waiting {}s for {} waveforms to be deleted'
+        logging.info(msg.format(wait_time,  nb_waveforms))
         time.sleep(wait_time)
 
     def clear_all_sequences(self):

exopy_hqc_legacy/instruments/drivers/visa_tools.py

@@ -174,13 +174,13 @@ def read_binary_values(self, datatype='f', is_big_endian=False):
         """
         return self._driver.read_binary_values(datatype, is_big_endian)
 
-    def query(self, message):
+    def query(self, message, *args, **kwargs):
         """Send the specified message to the instrument and read its answer.
 
         Simply call the `query` method of the `Instrument` object stored in
         the attribute `_driver`
         """
-        return self._driver.query(message)
+        return self._driver.query(message, *args, **kwargs)
 
     def query_ascii_values(self, message, converter='f', separator=','):
         """Send the specified message to the instrument and convert its answer

exopy_hqc_legacy/tasks/tasks/instr/run_awg.py

@@ -12,7 +12,7 @@
 import logging
 import time
 
-from atom.api import (Str, set_default)
+from atom.api import (Float, Str, set_default)
 
 from exopy.tasks.api import InstrumentTask