These were left on the cryofree computer; there is:

exopy_hqc_legacy/instruments/drivers/dll/sp_adq14.py

@@ -67,6 +67,11 @@ def destroy_board(self, b_id):
         self.library.ControlUnit_DeleteADQ(self.id, b_id)
         del self._boards[b_id-1]
 
+    def enable_logging(self, level, path):
+        """
+        """
+        self.library.ControlUnit_EnableErrorTrace(self.id, level, path)
+
     def _cleanup(self):
         """Make sure we disconnect all the boards and destroy the unit.
 
@@ -99,6 +104,7 @@ def open_connection(self):
 
         """
         cu = ADQControlUnit(self._dll)
+        cu.enable_logging(3, b"C:\\Logs")
         boards = cu.list_boards()
         board_id = None
         for i, b in enumerate(boards):
@@ -216,6 +222,8 @@ def get_traces(self, channels, duration, delay, records_per_capture,
         get_data = self._dll.GetData.func
         retrieved_records = 0
         while retrieved_records < records_per_capture:
+            # WHY ???
+            time.sleep(0.002)
             # Wait for a record to be acquired.
             n_records = (acq_records(cu, id_) - retrieved_records)
 

exopy_hqc_legacy/instruments/drivers/driver_tools.py

@@ -202,11 +202,11 @@ def wait_for_completion(self, break_condition_callable=None, timeout=15,
         while True:
             remaining_time = (timeout -
                               (time.time() - timeout_start))
-            time.sleep(min(refresh_time, remaining_time))
             if self.condition_callable():
                 return True
             if remaining_time < 0 or break_condition_callable():
                 return False
+            time.sleep(min(refresh_time, remaining_time))
 
     def cancel(self, *args, **kwargs):
         """Cancel the long running job.

exopy_hqc_legacy/instruments/drivers/visa/agilent_psa.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 #==============================================================================
 # module : agilent_psa.py
-# author : Benjamin Huard
 # license : MIT license
 #==============================================================================
 """
@@ -190,6 +189,7 @@ def mode(self):
         """
         """
         SAorBASIC = self.ask('inst:sel?')
+        SAorBASIC =  SAorBASIC[:-1]
         if SAorBASIC == 'SA':
             return 'SA'
         elif SAorBASIC == 'BASIC':

exopy_hqc_legacy/instruments/drivers/visa/cryomagnetics_cs4.py

@@ -75,12 +75,14 @@ def open_connection(self, **para):
         # set lower limit to lowest value
         self.write('LLIM -7')
 
+    @secure_communication()
     def read_output_field(self):
         """Read the current value of the output field.
 
         """
         return float(self.ask('IOUT?').strip(' T'))
 
+    @secure_communication()
     def read_persistent_field(self):
         """Read the current value of the persistent field.
 
@@ -132,6 +134,7 @@ def check_connection(self):
         pass
 
     @instrument_property
+    @secure_communication()
     def heater_state(self):
         """State of the switch heater allowing to inject current into the
         coil.
@@ -151,6 +154,7 @@ def heater_state(self, state):
             sleep(1)
 
     @instrument_property
+    @secure_communication()
     def field_sweep_rate(self):
         """Rate at which to ramp the field (T/min).
 
@@ -167,6 +171,7 @@ def field_sweep_rate(self, rate):
         self.write('RATE 0 {}'.format(rate))
 
     @instrument_property
+    @secure_communication()
     def fast_sweep_rate(self):
         """Rate at which to ramp the field when the switch heater is off
         (T/min).
@@ -182,6 +187,7 @@ def fast_sweep_rate(self, rate):
         self.write('RATE 3 {}'.format(rate))
 
     @instrument_property
+    @secure_communication()
     def target_field(self):
         """Field that the source will try to reach.
 
@@ -199,13 +205,15 @@ def target_field(self, target):
         self.write('ULIM {}'.format(target))
 
     @instrument_property
+    @secure_communication()
     def persistent_field(self):
         """Last known value of the magnet field.
 
         """
         return float(self.ask('IMAG?').strip(' T'))
 
     @instrument_property
+    @secure_communication()
     def activity(self):
         """Current activity of the power supply (idle, ramping).
 

exopy_hqc_legacy/instruments/drivers/visa_tools.py

@@ -95,6 +95,9 @@ def open_connection(self, **para):
 
         """
         rm = ResourceManager()
+
+        self.para = para
+
         try:
             self._driver = rm.open_resource(self.connection_str,
                                             open_timeout=1000, **para)
@@ -116,13 +119,13 @@ def reopen_connection(self):
         as previously.
 
         """
-        para = {'timeout': self._driver.timeout,
-                'query_delay': self._driver.query_delay,
-                'write_termination': self._driver.write_termination,
-                'read_termination': self._driver.read_termination,
-                }
-        self._driver.close()
-        self.open_connection(**para)
+        # para = {'timeout': self._driver.timeout,
+                # 'query_delay': self._driver.query_delay,
+                # 'write_termination': self._driver.write_termination,
+                # 'read_termination': self._driver.read_termination,
+                # }
+        # self._driver.close()
+        self.open_connection(**self.para)
 
     def connected(self):
         """Returns whether commands can be sent to the instrument

exopy_hqc_legacy/manifest.enaml

@@ -138,6 +138,15 @@ enamldef HqcLegacyManifest(PluginManifest):
                                        'VisaUSB': {'resource_class': 'INSTR'},
                                        'VisaTCPIP': {'resource_class': 'INSTR'}
                                        }
+                    Driver:
+                        driver = 'agilent_psa:AgilentPSA'
+                        serie = ''
+                        model = 'E4440A'
+                        kind = 'Spectrum analyser'
+                        connections = {'VisaGPIB': {'resource_class': 'INSTR'},
+                                       'VisaUSB': {'resource_class': 'INSTR'},
+                                       'VisaTCPIP': {'resource_class': 'INSTR'}
+                                       }
                 Drivers:
                     manufacturer = 'Yokogawa'
                     Driver:
@@ -423,6 +432,14 @@ enamldef HqcLegacyManifest(PluginManifest):
                     view = 'views.rf_views:PulseModulationView'
                     instruments = ['exopy_hqc_legacy.Legacy.RohdeSchwarzSMB100A',
                                    'exopy_hqc_legacy.Legacy.Anapico']
+                Task:
+                    task = 'psa_tasks:PSAGetTrace'
+                    view = 'views.psa_tasks_views:PSAGetTraceView'
+                    instruments = ['exopy_hqc_legacy.Legacy.AgilentPSA']
+                Task:
+                    task = 'psa_tasks:PSASetParam'
+                    view = 'views.psa_tasks_views:PSASetParamView'
+                    instruments = ['exopy_hqc_legacy.Legacy.AgilentPSA']
                 Task:
                     task = 'pna_tasks:PNASinglePointMeasureTask'
                     view = 'views.pna_task_views:PNASinglePointView'

exopy_hqc_legacy/tasks/tasks/instr/psa_tasks.py

@@ -17,6 +17,7 @@
 
 
 from exopy.tasks.api import InstrumentTask, validators
+from exopy.tasks.api import InstrumentTask, TaskInterface, validators
 
 # XXX unfinished
 
@@ -48,7 +49,7 @@ def perform(self):
         psa_config = header.format(d.start_frequency_SA, d.stop_frequency_SA,
                                    d.span_frequency, d.center_frequency,
                                    d.average_count_SA, d.RBW, d.VBW_SA,
-                                   d.sweep_points_SA, sweep_modes[self.mode])
+                                   d.sweep_points_SA, sweep_modes[d.mode])
 
         self.write_in_database('psa_config', psa_config)
         self.write_in_database('trace_data', self.driver.read_data(self.trace))
@@ -108,9 +109,9 @@ def perform(self):
                 self.driver.start_frequency_SA = \
                     self.format_and_eval_string(self.start_freq)
 
-            if self.stop_freq:
+            if self.end_freq:
                 self.driver.stop_frequency_SA = \
-                    self.format_and_eval_string(self.stop_freq)
+                    self.format_and_eval_string(self.end_freq)
 
             # start_freq is set again in case the former value of stop
             # prevented to do it
@@ -155,14 +156,14 @@ def perform(self):
                      {}'''.format(d.start_frequency_SA, d.stop_frequency_SA,
                                   d.span_frequency, d.center_frequency,
                                   d.average_count_SA, d.RBW, d.VBW_SA,
-                                  d.sweep_points_SA, sweep_modes[self.mode])
+                                  d.sweep_points_SA, sweep_modes[d.mode])
 
         self.write_in_database('psa_config', psa_config)
 
     def check(self, *args, **kwargs):
         """
         """
-        test, traceback = super(PSAGetTrace, self).check(*args, **kwargs)
+        test, traceback = super(PSASetParam, self).check(*args, **kwargs)
 
         err_path = self.get_error_path()
 
@@ -177,7 +178,7 @@ def check(self, *args, **kwargs):
                     start = self.format_and_eval_string(self.start_freq)
 # if type(self.driver).__name__ == 'AgilentPSA':
 # is a new PSA needs to be encoded, it would be best to use task_interfaces
-                    if (start < 3) or (start > 26500000000):
+                    if (start < 0) or (start > 26500000000):
                         raise Exception('out_of_range')
 
             except Exception as e:
@@ -192,21 +193,21 @@ def check(self, *args, **kwargs):
                         'formula {}'.format(self.start_freq)
 
             try:
-                if self.stop_freq:
-                    toto = self.format_and_eval_string(self.stop_freq)
-                    if (toto < 3) or (toto > 26500000000):
+                if self.end_freq:
+                    toto = self.format_and_eval_string(self.end_freq)
+                    if (toto < 0) or (toto > 26500000000):
                         raise Exception('out_of_range')
 
             except Exception as e:
                 test = False
                 if e.args == 'out_of_range':
                     traceback[err_path +
-                              '-stop_freq'] = 'Stop frequency {} out of ' + \
+                              '-end_freq'] = 'Stop frequency {} out of ' + \
                         'range'.format(self.start_freq)
                 else:
                     traceback[err_path +
-                              '-stop_freq'] = 'Failed to eval the stop' + \
-                        'formula {}'.format(self.stop_freq)
+                              '-end_freq'] = 'Failed to eval the stop' + \
+                        'formula {}'.format(self.end_freq)
         else:
             try:
                 if self.span_freq:

exopy_hqc_legacy/tasks/tasks/instr/views/psa_tasks_views.enaml

@@ -15,10 +15,11 @@ from enaml.core.api import Conditional
 from enaml.widgets.api import (GroupBox, Label, Field, ObjectCombo, CheckBox)
 from enaml.layout.api import factory
 
-from exopy.tasks.api import InstrView, EVALUATER_TOOLTIP
+from exopy.tasks.api import EVALUATER_TOOLTIP
 from exopy.utils.widgets.qt_completers import QtLineCompleter
 from exopy_hqc_legacy.utils.layouts import auto_grid_layout
-from ..base_instr_view import InstrView
+from ...base_instr_view import InstrView
+
 
 # XXX unfinished
 

exopy_hqc_legacy/tasks/tasks/util/load_tasks.py

@@ -101,7 +101,7 @@ def perform(self):
                     break
 
         data = np.genfromtxt(full_path, comments=self.comments,
-                             delimiter=self.delimiter, names=self.names,
+                             delimiter=self.delimiter, names=self.names if self.names else None,
                              skip_header=comment_lines)
 
         task.write_in_database('array', data)
@@ -140,5 +140,5 @@ def _post_setattr_c_names(self, old, new):
         """Keep the c_names  in sync with the array in the database.
 
         """
-        if new:
+        if new and self.task:
             self.task.write_in_database('array', _make_array(new))