Qelec branch : for travis checks

.coveragerc~

@@ -0,0 +1,6 @@
+[report]
+omit =
+    */hqc_start.py
+    */hqc_meas/instruments/drivers/visa/*
+    */hqc_meas/instruments/drivers/dll/*
+    */hqc_meas/utils/widgets/*

.travis.yml

@@ -16,6 +16,9 @@ install:
     - travis_retry sudo apt-get -qq -y install python-numpy python-nose python-setuptools > ${REDIRECT_TO};
     - pip install -q coveralls nose-timer
 
+    # Install future
+    - pip install -q future
+
     # Install atom enaml from pip
     - pip install -q ply
     - pip install -q atom
@@ -38,7 +41,7 @@ before_script:
 
 script:
     - cd ${SRC_DIR}
-    - nosetests -a '!no_travis' --with-coverage --cover-package hqc_meas 
+    - nosetests -a '!no_travis' --with-coverage --cover-package hqc_meas
 
 after_success:
     # Need to run from source dir to execute appropriate "git" commands

hqc_meas/app_closing.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
-#==============================================================================
+# =============================================================================
 # module : app_closing.py
 # author : Matthieu Dartiailh
 # license : MIT license
-#==============================================================================
+# =============================================================================
 
 from atom.api import Callable, Unicode
 from enaml.core.declarative import Declarative, d_

hqc_meas/instruments/dll/__init__.py

@@ -1,2 +1,6 @@
 # -*- coding: utf-8 -*-
 
+import os
+from pyclibrary.utils import (add_header_locations)
+
+add_header_locations([os.path.join(os.path.dirname(__file__), 'headers')])

hqc_meas/instruments/manager/manifest.enaml

@@ -41,7 +41,8 @@ def show_starting_errors(event):
     manager = event.workbench.get_plugin('hqc_meas.instr_manager')
     ui = event.workbench.get_plugin('enaml.workbench.ui')
     ErrorsDisplay(ui.window, title='Instr manager start up errors',
-                  errors=manager.report()).exec_()
+                  errors=manager.report(),
+                  errors_type='Import failures').exec_()
 
 
 def matching_drivers(event):

hqc_meas/instruments/visa/tabor_awg.py

@@ -0,0 +1,313 @@
+# -*- coding: utf-8 -*-
+# =============================================================================
+# module : AWG.py
+# author : Pierre Heidmann and Nathanael Cottet
+# license : MIT license
+# =============================================================================
+""" This module defines drivers for Tabor AWG using VISA library.
+
+:Contains:
+    TaborAWGChannel
+    AWG
+
+
+"""
+
+
+from threading import Lock
+from contextlib import contextmanager
+from ..driver_tools import (BaseInstrument, InstrIOError, secure_communication,
+                            instrument_property)
+from ..visa_tools import VisaInstrument
+from visa import VisaTypeError
+from textwrap import fill
+from inspect import cleandoc
+import re
+import time
+
+
+class TaborAWGChannel(BaseInstrument):
+
+    def __init__(self, AWG, channel_num, caching_allowed=True,
+                 caching_permissions={}):
+        super(TaborAWGChannel, self).__init__(None, caching_allowed,
+                                         caching_permissions)
+        self._AWG = AWG
+        self._channel = channel_num
+
+    def reopen_connection(self):
+        self._AWG.reopen_connection()
+
+
+    @contextmanager
+    def secure(self):
+        """ Lock acquire and release method
+
+        """
+        i = 0
+        while not self._AWG.lock.acquire():
+            time.sleep(0.1)
+            i += 1
+            if i > 50:
+                raise InstrIOError
+        try:
+            yield
+        finally:
+            self._AWG.lock.release()
+
+    @instrument_property
+    @secure_communication()
+    def output_state(self):
+        """ Output getter method
+
+        """
+        with self.secure():
+            self._AWG.write('INST {}'.format(self._channel))
+            output = self._AWG.ask('OUTP?'
+                                             )
+            if output == 'ON':
+                return 'ON'
+            elif output == 'OFF':
+                return 'OFF'
+            else:
+                mes = cleandoc('AWG channel {} did not return its output'
+                               .format(self._channel))
+                raise InstrIOError(mes)
+
+    @output_state.setter
+    @secure_communication()
+    def output_state(self, value):
+        """ Output setter method. 'ON', 'OFF'
+
+        """
+        with self.secure():
+            on = re.compile('on', re.IGNORECASE)
+            off = re.compile('off', re.IGNORECASE)
+            if on.match(value) or value == 1:
+
+                self._AWG.write('INST {}'.format(self._channel))
+                self._AWG.write('SOUR:FUNC:MODE USER')
+                self._AWG.write('OUTP ON')
+                if self._AWG.ask('OUTP?'
+                                            ) != 'ON':
+                    raise InstrIOError(cleandoc('''Instrument did not set
+                                                correctly the output'''))
+            elif off.match(value) or value == 0:
+                self._AWG.write('INST {}'.format(self._channel))
+                self._AWG.write('SOUR:FUNC:MODE USER')
+                self._AWG.write('OUTP OFF')
+                if self._AWG.ask('OUTP?'
+                                            ) != 'OFF':
+                    raise InstrIOError(cleandoc('''Instrument did not set
+                                                correctly the output'''))
+            else:
+                mess = fill(cleandoc('''The invalid value {} was sent to
+                            switch_on_off method''').format(value), 80)
+                raise VisaTypeError(mess)
+
+
+
+
+class TaborAWG(VisaInstrument):
+    """
+    """
+    caching_permissions = {'defined_channels': True}
+
+    def __init__(self, connection_info, caching_allowed=True,
+                 caching_permissions={}, auto_open=True):
+        super(TaborAWG, self).__init__(connection_info, caching_allowed,
+                                  caching_permissions, auto_open)
+        self.channels = {}
+        self.lock = Lock()
+
+    def get_channel(self, num):
+        """
+        """
+        if num not in self.defined_channels:
+            return None
+
+        if num in self.channels:
+            return self.channels[num]
+        else:
+            channel = TaborAWGChannel(self, num)
+            self.channels[num] = channel
+            return channel
+
+    @secure_communication()
+    def to_send(self, waveform, ch_id):
+        """Command to send to the instrument. waveform = string of a bytearray
+
+        """
+        numbyte = len(waveform)
+        self.write('INST {}'.format(ch_id))
+        self.write('TRAC:MODE SING')
+        numApresDiese = len('{}'.format(numbyte))
+        header = "TRAC#{}{}".format(numApresDiese, numbyte)
+        self.write('{}{}'.format(header, waveform))
+
+    @instrument_property
+    @secure_communication()
+    def defined_channels(self):
+        """
+        """
+        defined_channels = [1, 2, 3, 4]
+        return defined_channels
+
+    @instrument_property
+    @secure_communication()
+    def oscillator_reference_external(self):
+        """oscillator reference external getter method
+        """
+        ore = self.ask("SOUR:ROSC:SOUR?")
+        if ore == 'EXT':
+            return 'True'
+        elif ore == 'INT':
+            return 'False'
+        else:
+            raise InstrIOError
+
+    @oscillator_reference_external.setter
+    @secure_communication()
+    def oscillator_reference_external(self, value):
+        """oscillator reference external setter method
+        """
+        if value in ('EXT', 1, 'True'):
+            self.write('SOUR:ROSC:SOUR EXT')
+            if self.ask('SOUR:ROSC:SOUR?') != 'EXT':
+                raise InstrIOError(cleandoc('''Instrument did not set
+                                            correctly the oscillator
+                                            reference'''))
+        elif value in ('INT', 0, 'False'):
+            self.write('SOUR:ROSC:SOUR INT')
+            if self.ask('SOUR:ROSC:SOUR?') != 'INT':
+                raise InstrIOError(cleandoc('''Instrument did not set
+                                            correctly the oscillator
+                                            reference'''))
+        else:
+            mess = fill(cleandoc('''The invalid value {} was sent to
+                                 oscillator_reference_external
+                                 method''').format(value), 80)
+            raise VisaTypeError(mess)
+
+    @instrument_property
+    @secure_communication()
+    def clock_source(self):
+        """clock source getter method
+        """       
+
+        cle = self.ask("FREQ:RAST:SOUR?")
+        if cle is not None:
+            return cle
+        else:
+            raise InstrIOError
+
+    @clock_source.setter
+    @secure_communication()
+    def clock_source(self, value):
+        """clock source setter method
+        """
+        if value in ('EXT', 1, 'True'):
+            self.write(':FREQ:RAST:SOUR EXT')
+            if self.ask(':FREQ:RAST:SOUR?') != 'EXT':
+                raise InstrIOError(cleandoc('''Instrument did not set
+                                            correctly the clock source'''))
+        elif value in ('INT', 0, 'False'):
+            self.write(':FREQ:RAST:SOUR INT')
+            if self.ask(':FREQ:RAST:SOUR?') != 'INT':
+                raise InstrIOError(cleandoc('''Instrument did not set
+                                            correctly the clock source'''))
+        else:
+            mess = fill(cleandoc('''The invalid value {} was sent to
+                                 clock_source_external
+                                 method''').format(value), 80)
+            raise VisaTypeError(mess)
+
+    @instrument_property
+    @secure_communication()
+    def sampling_frequency(self):
+        """sampling frequency getter method
+        """
+        sampl_freq = self.ask_for_values("FREQ:RAST?")[0]
+        if sampl_freq is not None:
+            return sampl_freq
+        else:
+            raise InstrIOError
+
+    @sampling_frequency.setter
+    @secure_communication()
+    def sampling_frequency(self, value):
+        """sampling frequency setter method
+        """
+        self.write("FREQ:RAST {}".format(value))
+        result = self.ask_for_values("FREQ:RAST?")[0]
+        if abs(result - value) > 10**-12:
+            raise InstrIOError(cleandoc('''Instrument did not set correctly
+                                        the sampling frequency'''))
+
+    @instrument_property
+    @secure_communication()
+    def running(self):
+        """Run state getter method
+        """
+        return '2 : Intrument is running'
+
+    @running.setter
+    @secure_communication()
+    def running(self, value):
+        """Run state setter method
+        """
+
+
+    @instrument_property
+    @secure_communication()
+    def run_mode(self):
+        """Run mode getter method
+        """
+        run_cont = self.ask("INIT:CONT?")
+        run_gat=self.ask("INIT:GATE?")
+        if run_cont is not None:
+            if run_cont == 'ON':
+                return 'Continuous'
+            elif run_gat == 'ON':
+                return 'Gated'
+            else:
+                return 'Triggered'
+
+        else:
+            raise InstrIOError
+
+    @run_mode.setter
+    @secure_communication()
+    def run_mode(self, value):
+        """Run mode setter method
+        """
+        if value in ('CONT', 'CONTINUOUS', 'continuous'):
+            self.write('INIT:CONT ON')
+            if self.ask('INIT:CONT?') != 'ON':
+                raise InstrIOError(cleandoc('''Instrument did not set
+                                            correctly the run mode'''))
+        elif value in ('TRIG', 'TRIGGERED', 'triggered'):
+            self.write('INIT:CONT OFF')
+            self.write('INIT:GATE OFF')
+            if self.ask('INIT:CONT?') != 'OFF':
+                raise InstrIOError(cleandoc('''Instrument did not set
+                                            correctly the run mode'''))
+            elif self.ask('INIT:GATE?') != 'OFF':
+                raise InstrIOError(cleandoc('''Instrument did not set
+                                            correctly the run mode'''))
+        elif value in ('GAT', 'GATED', 'gated'):
+            self.write('INIT:CONT OFF')
+            self.write('INIT:GATE ON')
+            if self.ask('INIT:CONT?') != 'OFF':
+                raise InstrIOError(cleandoc('''Instrument did not set
+                                            correctly the run mode'''))
+            elif self.ask('INIT:GATE?') != 'ON':
+                raise InstrIOError(cleandoc('''Instrument did not set
+                                            correctly the run mode'''))
+        else:
+            mess = fill(cleandoc('''The invalid value {} was sent to
+                                 run mode method''').format(value), 80)
+            raise VisaTypeError(mess)
+
+
+DRIVERS = {'TaborAWG': TaborAWG}