Add old alias for DS4000

microsoft · Aug 23, 2022 · 3b8c69c · 3b8c69c
1 parent 9a4e87c
commit 3b8c69c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/qcodes/instrument_drivers/rigol/DS4000.py b/qcodes/instrument_drivers/rigol/DS4000.py
@@ -0,0 +1,14 @@
+"""
+Old alias for RigolDS4000 for backwards compatibility.
+Will eventually be deprecated and removed.
+"""
+from .RigolDS4000 import (
+    RigolDS4000,
+    RigolDS4000Channel,
+    RigolDS4000TraceNotReady,
+    ScopeArray,
+)
+
+
+class DS4000(RigolDS4000):
+    pass
diff --git a/qcodes/instrument_drivers/rigol/RigolDS4000.py b/qcodes/instrument_drivers/rigol/RigolDS4000.py
@@ -15,7 +15,7 @@
 log = logging.getLogger(__name__)
 
 
-class TraceNotReady(Exception):
+class RigolDS4000TraceNotReady(Exception):
     pass
 
 
@@ -66,9 +66,9 @@ def prepare_curvedata(self) -> None:
 
     def get_raw(self) -> ParamRawDataType:
         assert isinstance(self.instrument, RigolDS4000Channel)
-        assert isinstance(self.root_instrument, DS4000)
+        assert isinstance(self.root_instrument, RigolDS4000)
         if not self.trace_ready:
-            raise TraceNotReady(
+            raise RigolDS4000TraceNotReady(
                 "Please run prepare_curvedata to prepare "
                 "the scope for giving a trace."
             )