Merge pull request #4582 from jenshnielsen/driver/alazar

Update Alazar drivers to confrom to naming standard

docs/Makefile

@@ -29,6 +29,7 @@ genapi:
 		../qcodes/instrument_drivers/american_magnetics\* \
 		../qcodes/instrument_drivers/agilent \
 		../qcodes/instrument_drivers/AimTTi \
+		../qcodes/instrument_drivers/AlazarTech \
 		../qcodes/instrument_drivers/basel \
 		../qcodes/instrument_drivers/HP \
 		../qcodes/instrument_drivers/ithaco \

docs/drivers_api/AlazarTech.rst

@@ -0,0 +1,7 @@
+.. _Alazar_api :
+
+Alazar Tech Drivers
+===================
+
+.. automodule:: qcodes.instrument_drivers.AlazarTech
+    :autosummary:

docs/make.bat

@@ -39,6 +39,7 @@ REM for storing drivers, not the lower-case one).
 sphinx-apidoc  -o  _auto  -d 10 ..\qcodes ^
     ..\qcodes\instrument_drivers\agilent\* ^
     ..\qcodes\instrument_drivers\AimTTi ^
+    ..\qcodes\instrument_drivers\AlazarTech ^
     ..\qcodes\instrument_drivers\american_magnetics\* ^
     ..\qcodes\instrument_drivers\basel ^
     ..\qcodes\instrument_drivers\HP ^

qcodes/instrument_drivers/AlazarTech/ATS9360.py

@@ -9,7 +9,7 @@
 from .utils import TraceParameter
 
 
-class AlazarTech_ATS9360(AlazarTech_ATS):
+class AlazarTechATS9360(AlazarTech_ATS):
     """
     This class is the driver for the ATS9360 board
     it inherits from the ATS base class
@@ -373,3 +373,11 @@ def _set_trigger_holdoff(self, value: bool) -> None:
             disable_mask = ~np.uint32(1 << 26)
             new_value = current_value & disable_mask
         self._write_register(58, int(new_value))
+
+
+class AlazarTech_ATS9360(AlazarTechATS9360):
+    """
+    Alias for backwards compatibility. Will eventually be deprecated and removed
+    """
+
+    pass

qcodes/instrument_drivers/AlazarTech/ATS9373.py

@@ -8,7 +8,7 @@
 from qcodes.instrument_drivers.AlazarTech.utils import TraceParameter
 
 
-class AlazarTech_ATS9373(AlazarTech_ATS):
+class AlazarTechATS9373(AlazarTech_ATS):
     """
     This class is the driver for the ATS9373 board.
 
@@ -388,3 +388,11 @@ def _set_trigger_holdoff(self, value: bool) -> None:
             disable_mask = ~np.uint32(1 << 26)
             new_value = current_value & disable_mask
         self._write_register(58, int(new_value))
+
+
+class AlazarTech_ATS9373(AlazarTechATS9373):
+    """
+    Alias for backwards compatibility. Will eventually be deprecated and removed
+    """
+
+    pass

qcodes/instrument_drivers/AlazarTech/ATS9440.py

@@ -6,7 +6,7 @@
 from .utils import TraceParameter
 
 
-class AlazarTech_ATS9440(AlazarTech_ATS):
+class AlazarTechATS9440(AlazarTech_ATS):
     """
     This class is the driver for the ATS9440 board
     it inherits from the ATS base class
@@ -300,3 +300,11 @@ def __init__(self, name: str,
                            set_cmd=None,
                            initial_value=1000,
                            vals=validators.Ints(min_value=0))
+
+
+class AlazarTech_ATS9440(AlazarTechATS9440):
+    """
+    Alias for backwards compatibility. Will eventually be deprecated and removed
+    """
+
+    pass

qcodes/instrument_drivers/AlazarTech/ATS9870.py

@@ -6,7 +6,7 @@
 from .utils import TraceParameter
 
 
-class AlazarTech_ATS9870(AlazarTech_ATS):
+class AlazarTechATS9870(AlazarTech_ATS):
     """
     This class is the driver for the ATS9870 board
     it inherits from the ATS base class
@@ -305,3 +305,11 @@ def __init__(self, name: str,
         if model != 'ATS9870':
             raise Exception(f"The Alazar board kind is not 'ATS9870',"
                             f" found '{str(model)}' instead.")
+
+
+class AlazarTech_ATS9870(AlazarTechATS9870):
+    """
+    Alias for backwards compatibility. Will eventually be deprecated and removed
+    """
+
+    pass

qcodes/instrument_drivers/AlazarTech/ATS_acquisition_controllers.py

@@ -7,7 +7,7 @@
 
 
 # DFT AcquisitionController
-class Demodulation_AcquisitionController(AcquisitionController[float]):
+class DemodulationAcquisitionController(AcquisitionController[float]):
     """
     This class represents an example acquisition controller. End users will
     probably want to use something more sophisticated. It will average all
@@ -158,3 +158,11 @@ def fit(self, buf: np.ndarray) -> Tuple[float, float]:
 
         # see manual page 52!!! (using unsigned data)
         return ampl, math.atan2(ImPart, RePart) * 360 / (2 * math.pi)
+
+
+class Demodulation_AcquisitionController(DemodulationAcquisitionController):
+    """
+    Alias for backwards compatibility. Will eventually be deprecated and removed
+    """
+
+    pass

qcodes/instrument_drivers/AlazarTech/__init__.py

@@ -0,0 +1,15 @@
+from .ATS import AcquisitionController
+from .ATS9360 import AlazarTechATS9360
+from .ATS9373 import AlazarTechATS9373
+from .ATS9440 import AlazarTechATS9440
+from .ATS9870 import AlazarTechATS9870
+from .ATS_acquisition_controllers import DemodulationAcquisitionController
+
+__all__ = [
+    "AcquisitionController",
+    "AlazarTechATS9360",
+    "AlazarTechATS9373",
+    "AlazarTechATS9440",
+    "AlazarTechATS9870",
+    "DemodulationAcquisitionController",
+]