Add configure method

bmarechal
1 parent ff6ac07476
Showing 1 changed file with 11 additions and 18 deletions Side-by-side Diff
instruments/TPG261.py
@@ -10,30 +10,23 @@
 #==============================================================================
  
 class TPG261(abstract_instrument):
-    def __init__(self, adress=ADRESS, vtype=[ALL_VAL_TYPE[0]], channels = [ALL_CHANNELS[0]]):
+    def __init__(self, channels, vtypes, adress):
         self.adress = adress
-        self.vtype = vtype
+        self.channels = channels
+        self.vtypes = vtypes
  
     def model(self):
         return "PfeifferTPG261"
  
     def connect(self):
-        try:
-            print('Connecting to device @%s...' %(self.adress))
-            self.TPG = MaxiGauge(self.adress)
-            print('  --> Ok')
+        print('Connecting to device @%s...' %(self.adress))
+        self.TPG = MaxiGauge(self.adress)
+        print('  --> Ok')
+        print(self.model())
+        self.configure()
  
-            print(self.model())
-
-            if self.vtype == "PRE":
-                1
-            else:
-                print("Wrong -v argument")
-                raise
-
-        except Exception as er:
-            print("Unexpected error during connection: " + str(er))
-            raise
+    def configure(self):
+	pass
  
     def getValue(self):
 	self.read()
...	...	@@ -10,30 +10,23 @@
10	10	#==============================================================================
11	11
12	12	class TPG261(abstract_instrument):
13		- def __init__(self, adress=ADRESS, vtype=[ALL_VAL_TYPE[0]], channels = [ALL_CHANNELS[0]]):
	13	+ def __init__(self, channels, vtypes, adress):
14	14	self.adress = adress
15		- self.vtype = vtype
	15	+ self.channels = channels
	16	+ self.vtypes = vtypes
16	17
17	18	def model(self):
18	19	return "PfeifferTPG261"
19	20
20	21	def connect(self):
21		- try:
22		- print('Connecting to device @%s...' %(self.adress))
23		- self.TPG = MaxiGauge(self.adress)
24		- print(' --> Ok')
	22	+ print('Connecting to device @%s...' %(self.adress))
	23	+ self.TPG = MaxiGauge(self.adress)
	24	+ print(' --> Ok')
	25	+ print(self.model())
	26	+ self.configure()
25	27
26		- print(self.model())
27		-
28		- if self.vtype == "PRE":
29		- 1
30		- else:
31		- print("Wrong -v argument")
32		- raise
33		-
34		- except Exception as er:
35		- print("Unexpected error during connection: " + str(er))
36		- raise
	28	+ def configure(self):
	29	+ pass
37	30
38	31	def getValue(self):
39	32	self.read()