run_awg: cleanup

Author: rassouly

exopy_hqc_legacy/instruments/drivers/visa/tabor_awg.py

@@ -249,13 +249,13 @@ def sampling_frequency(self, value):
     def running(self):
         """Run state getter method
         """
-        return '2 : Intrument is running'
+        return True
 
-    @running.setter
     @secure_communication()
-    def running(self, value):
+    def set_running(self, value, delay=0):
         """Run state setter method
         """
+        pass
 
 
     @instrument_property

exopy_hqc_legacy/instruments/drivers/visa/tektro_awg.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # -----------------------------------------------------------------------------
-# Copyright 2015-2018 by ExopyHqcLegacy Authors, see AUTHORS for more details.
+# Copyright 2015-2020 by ExopyHqcLegacy Authors, see AUTHORS for more details.
 #
 # Distributed under the terms of the BSD license.
 #
@@ -507,9 +507,10 @@ def to_send(self, name, waveform):
         self.write('*WAI')
 
     @secure_communication()
-    def send_load_awg_file(self, awg_file, filename='setup'):
+    def send_load_awg_file(self, awg_data, filename='setup'):
         """Command to send and load and .awg file into the AWG
-                awg_file = bytearray
+
+           awg_data = bytearray
 
         """
         name_str = 'MMEMory:DATA "{}",'.format(filename+'.awg')
@@ -729,37 +730,21 @@ def sampling_frequency(self, value):
             raise InstrIOError(cleandoc('''Instrument did not set correctly
                                         the sampling frequency'''))
 
-    @instrument_property
     @secure_communication()
-    def running(self):
-        """Run state getter method
-
-        """
-        self.clear_output_buffer()
-        run = self.ask_for_values("AWGC:RST?")[0]
-        if run == 0:
-            return '0 : Instrument has stopped'
-        elif run == 1:
-            return '1 : Instrument is waiting for trigger'
-        elif run == 2:
-            return '2 : Intrument is running'
-        else:
-            raise InstrIOError
-
-    @running.setter
-    @secure_communication()
-    def running(self, value):
+    def set_running(self, value, delay=0.0):
         """Run state setter method
 
         """
         self.clear_output_buffer()
-        if value in ('RUN', 1, 'True'):
+        if value in ('RUN', 1, 'True', True):
             self.write('AWGC:RUN:IMM')
-            values = self.query('AWGC:RST?', format=2, delay=self.delay)
+            self.write('AWGC:RST?')
+            time.sleep(delay)
+            values = self.read_values(format=2)
             if values[0] not in (1, 2):
                 raise InstrIOError(cleandoc('''Instrument did not set
                                             correctly the run state'''))
-        elif value in ('STOP', 0, 'False'):
+        elif value in ('STOP', 0, 'False', False):
             self.write('AWGC:STOP:IMM')
             if self.ask_for_values('AWGC:RST?')[0] != 0:
                 raise InstrIOError(cleandoc('''Instrument did not set
@@ -769,6 +754,20 @@ def running(self, value):
                                  running method''').format(value), 80)
             raise VisaTypeError(mess)
 
+    @instrument_property
+    @secure_communication()
+    def running(self):
+        """Run state getter method
+
+        """
+        self.clear_output_buffer()
+        run = self.ask_for_values("AWGC:RST?")[0]
+        if run == 0:
+            return False
+        if run == 1 or run == 2:
+            return True
+        raise InstrIOError
+
     @instrument_property
     @secure_communication()
     def run_mode(self):
@@ -819,6 +818,7 @@ 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
         except Exception:
             nb_waveforms = 0

exopy_hqc_legacy/tasks/tasks/instr/run_awg.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # -----------------------------------------------------------------------------
-# Copyright 2015-2018 by ExopyHqcLegacy Authors, see AUTHORS for more details.
+# Copyright 2015-2020 by ExopyHqcLegacy Authors, see AUTHORS for more details.
 #
 # Distributed under the terms of the BSD license.
 #
@@ -10,51 +10,51 @@
 
 """
 import logging
-import numbers
 import time
 
 from atom.api import (Float, Unicode, set_default)
 
-from exopy.tasks.api import (InstrumentTask, validators)
+from exopy.tasks.api import InstrumentTask
 
 
 class RunAWGTask(InstrumentTask):
     """ Task to set AWG run mode
 
     """
-    #: Switch to choose the AWG run mode: on or off
-    switch = Unicode('Off').tag(pref=True, feval=validators.SkipLoop())
+    #: Switch to choose the AWG run mode
+    switch = Unicode('Off').tag(pref=True)
+
+    #: Delay required to load the sequence
     delay = Float(0).tag(pref=True)
+
     database_entries = set_default({'output': 0})
 
-    def perform(self, switch=None):
+    def perform(self):
         """Default interface behavior.
 
         """
-        if switch is None:
-            switch = self.format_and_eval_string(self.switch)
-        if switch == 'On' or switch == 1:
+        if self.switch.lower() == 'on' or self.switch == '1':
             self.driver.send_event()
             # The delay is required when loading large sequences
-            self.driver.run_awg(1, delay=delay)
+            self.driver.set_running(True, delay=self.delay)
             self.write_in_database('output', 1)
-        elif switch == 'Event':
-            time.sleep(delay)
+        elif self.switch.lower() == 'event':
+            time.sleep(self.delay)
             self.driver.send_event()
-        elif switch == 'Rearm':
-            print('Rearm')
-            time.sleep(delay)
+        elif self.switch.lower() == 'rearm':
+            time.sleep(self.delay)
             success = False
             while not success:
                 self.driver.send_event()
                 pos = int(self.driver.ask_sequencer_pos())
                 if pos == 1:
                     success = True
-            time.sleep(delay)
-        else:
-            time.sleep(delay)
-            self.driver.run_awg(0)
+            time.sleep(self.delay)
+        elif self.switch.lower() == 'off' or self.switch == '0':
+            time.sleep(self.delay)
+            self.driver.set_running(False)
             self.write_in_database('output', 0)
-        log = logging.getLogger(__name__)
-        msg = 'AWG running state OK'
-        log.debug(msg)
+        else:
+            logger = logging.getLogger(__name__)
+            msg = "Unable to recognize {} running mode"
+            logger.warning(msg.format(switch))

exopy_hqc_legacy/tasks/tasks/instr/views/run_awg_views.enaml

@@ -11,13 +11,12 @@
 """
 from enaml.stdlib.fields import FloatField
 from enaml.core.api import Conditional
-from enaml.widgets.api import (GroupBox, Label, Field, ObjectCombo, CheckBox)
+from enaml.widgets.api import (Label, Field)
 from enaml.layout.api import factory
 
 from textwrap import fill
 
-from exopy.tasks.api import InstrTaskView, EVALUATER_TOOLTIP
-from exopy.utils.widgets.qt_completers import QtLineCompleter
+from exopy.tasks.api import InstrTaskView
 from exopy_hqc_legacy.utils.layouts import auto_grid_layout
 from ...base_instr_view import InstrView
 
@@ -36,11 +35,10 @@ enamldef RunAWGView(InstrView): view:
         condition << not in_loop
         Label:
             text = 'Output'
-        QtLineCompleter:
+        Field:
             hug_width = 'ignore'
             text := task.switch
-            entries_updater << task.list_accessible_database_entries
-            tool_tip = 'Should be On, Off or Event'
+            tool_tip = 'Should be On, Off, Event or Rearm'
 
     Label: delay:
         text = 'Delay (s)'

tests/pulses/contexts/test_awg_context.py

@@ -54,7 +54,7 @@ def __init__(self):
         self.sequences = {}
         self.defined_channels = [1, 2, 3, 4]
         self.channels = {i: DummyChannel(self, i) for i in range(1, 5)}
-        self.running = False
+        self.set_running(False)
 
     def to_send(self, name, array):
         self.sequences[name] = array