[WIP] Ats9360 with channels

.gitignore

@@ -77,6 +77,15 @@ target/
 *.py~
 tmp/
 
+# DS-store
+*.DS_Store
+
+# Sublime text automation
+*.sublime-project
+*.sublime-workspace
+
+venv/
+
 docs/examples/data/*
 
 .idea/

docs/conf.py

@@ -383,6 +383,7 @@
 except ImportError as e:
         print(e)
 autodoc_mock_imports.append('pyspcm')
+autodoc_mock_imports.append('scipy')
 autodoc_mock_imports.append('zhinst')
 autodoc_mock_imports.append('zhinst.utils')
 autodoc_mock_imports.append('keysightSD1')

qcodes/instrument_drivers/AlazarTech/ATS9870.py

@@ -7,7 +7,7 @@ class AlazarTech_ATS9870(AlazarTech_ATS):
     This class is the driver for the ATS9870 board
     it inherits from the ATS base class
 
-    it creates all necessary parameters for the Alazar card
+    It creates all necessary parameters for the Alazar card
     """
     def __init__(self, name, **kwargs):
         dll_path = 'C:\\WINDOWS\\System32\\ATSApi.dll'
@@ -150,6 +150,23 @@ def __init__(self, name, **kwargs):
                            unit='10 us',
                            value=0,
                            vals=validators.Ints(min_value=0))
+        self.add_parameter(name='aux_io_mode',
+                           parameter_class=AlazarParameter,
+                           label='AUX I/O Mode',
+                           unit=None,
+                           value='AUX_IN_AUXILIARY',
+                           byte_to_value_dict={0: 'AUX_OUT_TRIGGER',
+                                               1: 'AUX_IN_TRIGGER_ENABLE',
+                                               13: 'AUX_IN_AUXILIARY'})
+
+        self.add_parameter(name='aux_io_param',
+                           parameter_class=AlazarParameter,
+                           unit=None,
+                           value='NONE',
+                           byte_to_value_dict={0: 'NONE',
+                                               1: 'TRIG_SLOPE_POSITIVE',
+                                               2: 'TRIG_SLOPE_NEGATIVE'})
+
 
         # ----- Parameters for the acquire function -----
         self.add_parameter(name='mode',

qcodes/instrument_drivers/AlazarTech/ATS_acquisition_controllers.py

@@ -27,8 +27,10 @@ def __init__(self, name, alazar_name, demodulation_frequency, **kwargs):
         self.demodulation_frequency = demodulation_frequency
         self.acquisitionkwargs = {}
         self.samples_per_record = None
+        self.bits_per_sample = None
         self.records_per_buffer = None
         self.buffers_per_acquisition = None
+        self.allocated_buffers = None
         # TODO(damazter) (S) this is not very general:
         self.number_of_channels = 2
         self.cos_list = None
@@ -43,16 +45,16 @@ def update_acquisitionkwargs(self, **kwargs):
         """
         This method must be used to update the kwargs used for the acquisition
         with the alazar_driver.acquire
-        :param kwargs:
-        :return:
+
+        Args:
+            **kwargs: New kwargs for the acquisition
         """
         self.acquisitionkwargs.update(**kwargs)
 
     def do_acquisition(self):
         """
         this method performs an acquisition, which is the get_cmd for the
         acquisiion parameter of this instrument
-        :return:
         """
         value = self._get_alazar().acquire(acquisition_controller=self,
                                            **self.acquisitionkwargs)
@@ -61,7 +63,6 @@ def do_acquisition(self):
     def pre_start_capture(self):
         """
         See AcquisitionController
-        :return:
         """
         alazar = self._get_alazar()
         self.samples_per_record = alazar.samples_per_record.get()
@@ -81,7 +82,6 @@ def pre_start_capture(self):
     def pre_acquire(self):
         """
         See AcquisitionController
-        :return:
         """
         # this could be used to start an Arbitrary Waveform Generator, etc...
         # using this method ensures that the contents are executed AFTER the
@@ -91,14 +91,12 @@ def pre_acquire(self):
     def handle_buffer(self, data):
         """
         See AcquisitionController
-        :return:
         """
         self.buffer += data
 
     def post_acquire(self):
         """
         See AcquisitionController
-        :return:
         """
         alazar = self._get_alazar()
         # average all records in a buffer