Fix device files

alexforencich · Mar 27, 2017 · c1bdb29 · c1bdb29
1 parent 83c0137
commit c1bdb29
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 23 deletions.
diff --git a/ivi/rigol/rigolDS1074Z.py b/ivi/rigol/rigolDS1074Z.py
@@ -28,16 +28,16 @@
 
 class rigolDS1074Z(rigolDS1000Z):
     "Rigol DS1074Z IVI oscilloscope driver"
-    
+
     def __init__(self, *args, **kwargs):
+        self.__dict__.setdefault('_instrument_id', 'DS1074Z')
+
         super(rigolDS1074Z, self).__init__(*args, **kwargs)
-
-        self._instrument_id = 'RIGOL TECHNOLOGIES,DS1074Z'
+
         self._analog_channel_count = 4
         self._digital_channel_count = 0
         self._channel_count = self._analog_channel_count + self._digital_channel_count
         self._bandwidth = 70e6
-        
+
         self._init_channels()
-
-
+
diff --git a/ivi/rigol/rigolDS1104Z.py b/ivi/rigol/rigolDS1104Z.py
@@ -28,16 +28,17 @@
 
 class rigolDS1104Z(rigolDS1000Z):
     "Rigol DS1104Z IVI oscilloscope driver"
-    
+
     def __init__(self, *args, **kwargs):
+        self.__dict__.setdefault('_instrument_id', 'DS1104Z')
+
         super(rigolDS1104Z, self).__init__(*args, **kwargs)
-
-        self._instrument_id = 'RIGOL TECHNOLOGIES,DS1104Z'
+
         self._analog_channel_count = 4
         self._digital_channel_count = 0
         self._channel_count = self._analog_channel_count + self._digital_channel_count
         self._bandwidth = 100e6
-        
+
         self._init_channels()
-    
+
 
diff --git a/ivi/rigol/rigolMSO1074Z.py b/ivi/rigol/rigolMSO1074Z.py
@@ -28,16 +28,16 @@
 
 class rigolMSO1074Z(rigolDS1000Z):
     "Rigol MSO1074Z IVI oscilloscope driver"
-    
+
     def __init__(self, *args, **kwargs):
+        self.__dict__.setdefault('_instrument_id', 'MSO1074Z')
+
         super(rigolMSO1074Z, self).__init__(*args, **kwargs)
-
-        self._instrument_id = 'RIGOL TECHNOLOGIES,MSO1074Z'
+
         self._analog_channel_count = 4
         self._digital_channel_count = 16
         self._channel_count = self._analog_channel_count + self._digital_channel_count
         self._bandwidth = 70e6
-        
+
         self._init_channels()
-
-
+
diff --git a/ivi/rigol/rigolMSO1104Z.py b/ivi/rigol/rigolMSO1104Z.py
@@ -28,16 +28,16 @@
 
 class rigolMSO1104Z(rigolDS1000Z):
     "Rigol MSO1104Z IVI oscilloscope driver"
-    
+
     def __init__(self, *args, **kwargs):
+        self.__dict__.setdefault('_instrument_id', 'MSO1104Z')
+
         super(rigolMSO1104Z, self).__init__(*args, **kwargs)
-
-        self._instrument_id = 'RIGOL TECHNOLOGIES,MSO1104Z'
+
         self._analog_channel_count = 4
         self._digital_channel_count = 16
         self._channel_count = self._analog_channel_count + self._digital_channel_count
         self._bandwidth = 100e6
-        
+
         self._init_channels()
-
-
+