LeCroy T3DSO1204 Oscilloscope

pymeasure/instruments/lecroy/lecroyT3DSO1204.py

@@ -29,7 +29,7 @@
 
 import numpy as np
 
-from pymeasure.instruments import Instrument
+from pymeasure.instruments import Instrument, Channel
 from pymeasure.instruments.validators import strict_discrete_set, strict_range, \
     strict_discrete_range
 
@@ -206,8 +206,7 @@ def __exit__(self, exc_type, exc_val, exc_tb):
             self.adapter.connection.chunk_size = self.old_chunk_size
 
 
-# noinspection DuplicatedCode
-class Channel:
+class ScopeChannel(Channel):
     """ Implementation of a LeCroy T3DSO1204 Oscilloscope channel.
 
     Implementation modeled on Channel object of Keysight DSOX1102G instrument. """
@@ -510,10 +509,10 @@ def __init__(self, adapter, **kwargs):
         self._seconds_since_last_write = 0  # Timestamp of the last command
         self._header_size = 16  # bytes
         self._footer_size = 2  # bytes
-        self.ch1 = Channel(self, 1)
-        self.ch2 = Channel(self, 2)
-        self.ch3 = Channel(self, 3)
-        self.ch4 = Channel(self, 4)
+        self.ch_1 = ScopeChannel(self, 1)
+        self.ch_2 = ScopeChannel(self, 2)
+        self.ch_3 = ScopeChannel(self, 3)
+        self.ch_4 = ScopeChannel(self, 4)
         self.waveform_source = "C1"
         self.default_setup()
 

tests/instruments/lecroy/test_lecroyT3DSO1204.py

@@ -66,10 +66,10 @@ def test_bwlimit():
              (b"C1:BWL?", b"ON")
              ]
     ) as instr:
-        instr.ch1.bwlimit = False
-        assert instr.ch1.bwlimit is False
-        instr.ch1.bwlimit = True
-        assert instr.ch1.bwlimit is True
+        instr.ch_1.bwlimit = False
+        assert instr.ch_1.bwlimit is False
+        instr.ch_1.bwlimit = True
+        assert instr.ch_1.bwlimit is True
 
 
 def test_coupling():
@@ -84,12 +84,12 @@ def test_coupling():
              (b"C1:CPL?", b"GND")
              ],
     ) as instr:
-        instr.ch1.coupling = "dc 1M"
-        assert instr.ch1.coupling == "dc 1M"
-        instr.ch1.coupling = "ac 1M"
-        assert instr.ch1.coupling == "ac 1M"
-        instr.ch1.coupling = "ground"
-        assert instr.ch1.coupling == "ground"
+        instr.ch_1.coupling = "dc 1M"
+        assert instr.ch_1.coupling == "dc 1M"
+        instr.ch_1.coupling = "ac 1M"
+        assert instr.ch_1.coupling == "ac 1M"
+        instr.ch_1.coupling = "ground"
+        assert instr.ch_1.coupling == "ground"
 
 
 def test_offset():
@@ -100,8 +100,8 @@ def test_offset():
              (b"C1:OFST?", b"1.00E+00")
              ]
     ) as instr:
-        instr.ch1.offset = 1.
-        assert instr.ch1.offset == 1.
+        instr.ch_1.offset = 1.
+        assert instr.ch_1.offset == 1.
 
 
 def test_attenuation():
@@ -114,10 +114,10 @@ def test_attenuation():
              (b"C1:ATTN?", b"0.1")
              ]
     ) as instr:
-        instr.ch1.probe_attenuation = 100
-        assert instr.ch1.probe_attenuation == 100
-        instr.ch1.probe_attenuation = 0.1
-        assert instr.ch1.probe_attenuation == 0.1
+        instr.ch_1.probe_attenuation = 100
+        assert instr.ch_1.probe_attenuation == 100
+        instr.ch_1.probe_attenuation = 0.1
+        assert instr.ch_1.probe_attenuation == 0.1
 
 
 def test_skew_factor():
@@ -128,8 +128,8 @@ def test_skew_factor():
              (b"C1:SKEW?", b"1.00E-07S"),
              ]
     ) as instr:
-        instr.ch1.skew_factor = 1e-7
-        assert instr.ch1.skew_factor == 1e-7
+        instr.ch_1.skew_factor = 1e-7
+        assert instr.ch_1.skew_factor == 1e-7
 
 
 def test_channel_setup():
@@ -151,7 +151,7 @@ def test_channel_setup():
              (b"C1:TRSL?", b"POS"),
              ]
     ) as instr:
-        assert instr.ch1.current_configuration == {"channel": 1,
+        assert instr.ch_1.current_configuration == {"channel": 1,
                                                    "attenuation": 1.,
                                                    "bandwidth_limit": False,
                                                    "coupling": "dc 1M",
@@ -162,10 +162,10 @@ def test_channel_setup():
                                                    "volts_div": 0.05,
                                                    "inverted": False,
                                                    "trigger_coupling": "dc",
-                                                   "trigger_level": 0.150,
-                                                   "trigger_level2": 0.150,
-                                                   "trigger_slope": "positive"
-                                                   }
+                                                    "trigger_level": 0.150,
+                                                    "trigger_level2": 0.150,
+                                                    "trigger_slope": "positive"
+                                                    }
 
 
 def test_memory_size():
@@ -426,7 +426,7 @@ def test_measure_parameter():
              ]
     ) as instr:
         assert instr.measure_parameter("RISE", "channel2") == 3.6e-9
-        assert instr.ch3.measure_parameter("MEAN") == 3.6e-9
+        assert instr.ch_3.measure_parameter("MEAN") == 3.6e-9
 
 
 def test_menu():

tests/instruments/lecroy/test_lecroyT3DSO1204_with_device.py

@@ -101,9 +101,9 @@ def test_scope_connection(self):
 
     # Channel
     def test_ch_current_configuration(self, autoscaled_scope):
-        autoscaled_scope.ch1.offset = 0
-        autoscaled_scope.ch1.trigger_level = 0
-        autoscaled_scope.ch1.trigger_level2 = 0
+        autoscaled_scope.ch_1.offset = 0
+        autoscaled_scope.ch_1.trigger_level = 0
+        autoscaled_scope.ch_1.trigger_level2 = 0
         expected = {"channel": 1,
                     "attenuation": 1.,
                     "bandwidth_limit": False,
@@ -163,21 +163,21 @@ def test_ch_scale(self, scope, ch_number):
 
     def test_ch_trigger_level(self, autoscaled_scope):
         for case in self.TRIGGER_LEVELS:
-            autoscaled_scope.ch1.trigger_level = case
-            assert autoscaled_scope.ch1.trigger_level == case
+            autoscaled_scope.ch_1.trigger_level = case
+            assert autoscaled_scope.ch_1.trigger_level == case
 
     def test_ch_trigger_level2(self, autoscaled_scope):
         for case in self.TRIGGER_LEVELS:
-            autoscaled_scope.ch1.trigger_level2 = case
-            assert autoscaled_scope.ch1.trigger_level2 == case
+            autoscaled_scope.ch_1.trigger_level2 = case
+            assert autoscaled_scope.ch_1.trigger_level2 == case
 
     def test_ch_trigger_slope(self, autoscaled_scope):
         with pytest.raises(ValueError):
-            autoscaled_scope.ch1.trigger_slope = "abcd"
+            autoscaled_scope.ch_1.trigger_slope = "abcd"
         autoscaled_scope.trigger_select = ("edge", "c1", "off")
         for case in self.TRIGGER_SLOPES:
-            autoscaled_scope.ch1.trigger_slope = case
-            assert autoscaled_scope.ch1.trigger_slope == case
+            autoscaled_scope.ch_1.trigger_slope = case
+            assert autoscaled_scope.ch_1.trigger_slope == case
 
     # Timebase
     def test_timebase(self, autoscaled_scope):
@@ -242,7 +242,7 @@ def test_waveform_points(self, scope, case):
 
     def test_waveform_preamble(self, autoscaled_scope):
         autoscaled_scope.acquisition_type = "normal"
-        autoscaled_scope.ch1.offset = 0
+        autoscaled_scope.ch_1.offset = 0
         autoscaled_scope.waveform_points = 0
         autoscaled_scope.waveform_first_point = 0
         autoscaled_scope.waveform_sparsing = 1
@@ -356,7 +356,7 @@ def test_download_data(self, scope, case1, case2):
 
     def test_download_single_point(self, scope):
         scope.acquisition_type = "normal"
-        scope.ch1.display = True
+        scope.ch_1.display = True
         scope.single()
         data, time, preamble = scope.download_waveform(source="c1", requested_points=1)
         assert type(data) is np.ndarray
@@ -378,7 +378,7 @@ def test_download_single_point(self, scope):
     @pytest.mark.skip(reason="A human is needed to check the output waveform")
     def test_download_data_all_points(self, scope):
         from matplotlib import pyplot as plt
-        scope.ch1.display = True
+        scope.ch_1.display = True
         scope.single()
         sleep(1)
         data, time, preamble = scope.download_waveform(source="c1", requested_points=0)
@@ -392,7 +392,7 @@ def test_download_data_all_points(self, scope):
     @pytest.mark.skip(reason="A human is needed to check the output waveform")
     def test_download_data_sparsing(self, scope):
         from matplotlib import pyplot as plt
-        scope.ch1.display = True
+        scope.ch_1.display = True
         scope.single()
         sleep(1)
         data, time, preamble = scope.download_waveform(source="c1", requested_points=7e5,
@@ -412,7 +412,7 @@ def test_download_data_sparsing(self, scope):
     @pytest.mark.skip(reason="A human is needed to check the output waveform")
     def test_download_data_averaging_16(self, scope):
         from matplotlib import pyplot as plt
-        scope.ch1.display = True
+        scope.ch_1.display = True
         scope.run()
         scope.acquisition_type = "average"
         scope.acquisition_average = 16
@@ -435,7 +435,7 @@ def test_download_data_averaging_16(self, scope):
     @pytest.mark.skip(reason="A human is needed to check the output waveform")
     def test_download_data_averaging_256(self, scope):
         from matplotlib import pyplot as plt
-        scope.ch1.display = True
+        scope.ch_1.display = True
         scope.run()
         scope.acquisition_type = "average"
         scope.acquisition_average = 256