Commit 8e3f9cd166ab3b4bcec1dc26606b2176675f1559

Authored by bmarechal
1 parent dae7f45859
Exists in master

instruments/AG34461A_avg.py: add timed meas

Showing 1 changed file with 8 additions and 6 deletions Inline Diff

instruments/AG34461A_avg.py
from abstract_instrument import abstract_instrument 1 1 from abstract_instrument import abstract_instrument
import socket 2 2 import socket
import time 3 3 import time
4 4
#============================================================================== 5 5 #==============================================================================
6 6
ALL_VAL_TYPE = ['DCV', 'ACV', 'DCI', 'ACI', 'RES2W', 'RES4W', 'FREQ'] 7 7 ALL_VAL_TYPE = ['DCV', 'ACV', 'DCI', 'ACI', 'RES2W', 'RES4W', 'FREQ']
ALL_CHANNELS = ['1'] 8 8 ALL_CHANNELS = ['1']
9 9
ADDRESS = "192.168.0.61" 10 10 ADDRESS = "192.168.0.61"
CONF_VAL_TYPE = ['CONF:VOLT:DC', 'CONF:VOLT:AC', 'CONF:CURR:DC', 'CONF:CURR:AC', 'CONF:RES', 'CONF:FRES', 'CONF:FREQ'] 11 11 CONF_VAL_TYPE = ['CONF:VOLT:DC', 'CONF:VOLT:AC', 'CONF:CURR:DC', 'CONF:CURR:AC', 'CONF:RES', 'CONF:FRES', 'CONF:FREQ']
12 12
#============================================================================== 13 13 #==============================================================================
14 14
class AG34461A_avg(abstract_instrument): 15 15 class AG34461A_avg(abstract_instrument):
def __init__(self, channels, vtypes, address): 16 16 def __init__(self, channels, vtypes, address):
self.address = address 17 17 self.address = address
self.port = 5025 18 18 self.port = 5025
self.channels = channels 19 19 self.channels = channels
self.vtypes = vtypes 20 20 self.vtypes = vtypes
21 21
def model(self): 22 22 def model(self):
#self.send("*IDN?") 23 23 #self.send("*IDN?")
#return self.read() 24 24 #return self.read()
return "AG34461A" 25 25 return "AG34461A_avg"
26 26
def connect(self): 27 27 def connect(self):
print('Connecting to device @%s:%s...' %(self.address, self.port)) 28 28 print('Connecting to device @%s:%s...' %(self.address, self.port))
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) 29 29 self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.sock.settimeout(10.0) # Don't hang around forever 30 30 self.sock.settimeout(10.0) # Don't hang around forever
self.sock.connect((self.address, self.port)) 31 31 self.sock.connect((self.address, self.port))
self.send("SYST:BEEP") 32 32 self.send("SYST:BEEP")
print(' --> Ok') 33 33 print(' --> Ok')
print(self.model()) 34 34 print(self.model())
self.configure() 35 35 self.configure()
36 36
def configure(self): 37 37 def configure(self):
self.send("*RST") 38 38 self.send("*RST")
for ch in self.channels: 39 39 for ch in self.channels:
self.send(CONF_VAL_TYPE[ALL_VAL_TYPE.index(self.vtypes[self.channels.index(ch)])]) 40 40 self.send(CONF_VAL_TYPE[ALL_VAL_TYPE.index(self.vtypes[self.channels.index(ch)])])
self.send("CONF:VOLT:DC 10") 41 41 #self.send("CONF:VOLT:DC 1")
#self.send("VOLT:DC:NPLC 10") 42 42 self.send("VOLT:DC:NPLC 10")
self.send("SAMP:COUN 1") 43 43 self.send("SAMP:COUN 5")
self.send("TRIG:COUN 5") 44 44 self.send("TRIG:COUN 1")
self.send("TRIG:DEL 0") 45 45 self.send("TRIG:DEL 0")
self.send("SENS:ZERO:AUTO OFF") 46 46 self.send("SENS:ZERO:AUTO OFF")
self.send("TRIG:SOUR IMM") 47 47 self.send("TRIG:SOUR TIM")
48 self.send("TRIG:TIM 0.2")
self.send("INIT") 48 49 self.send("INIT")
49 50
def getValue(self): 50 51 def getValue(self):
mes = '' 51 52 mes = ''
for ch in self.channels: 52 53 for ch in self.channels:
self.send("FETC?") 53 54 self.send("FETC?")
mesTemp = self.read() 54 55 mesTemp = self.read()
56 #print(mesTemp)
mesTemp = map(float, mesTemp.split(',')) 55 57 mesTemp = map(float, mesTemp.split(','))
mes = mes + '\t' + str(sum(mesTemp)/len(mesTemp)) 56 58 mes = mes + '\t' + str(sum(mesTemp)/len(mesTemp))
self.send("INIT") 57 59 self.send("INIT")
mes = mes + '\n' 58 60 mes = mes + '\n'
return mes 59 61 return mes
60 62
def read(self): 61 63 def read(self):
ans = '' 62 64 ans = ''
nb_data_list = [] 63 65 nb_data_list = []
nb_data = '' 64 66 nb_data = ''
try: 65 67 try:
while ans != '\n': 66 68 while ans != '\n':
ans = self.sock.recv(1) 67 69 ans = self.sock.recv(1)
nb_data_list.append(ans) # Return the number of data 68 70 nb_data_list.append(ans) # Return the number of data
list_size = len(nb_data_list) 69 71 list_size = len(nb_data_list)
for j in range (0, list_size): 70 72 for j in range (0, list_size):
nb_data = nb_data+nb_data_list[j] 71 73 nb_data = nb_data+nb_data_list[j]
return nb_data 72 74 return nb_data
except socket.timeout: 73 75 except socket.timeout:
print "Socket timeout error when reading." 74 76 print "Socket timeout error when reading."
raise 75 77 raise
76 78
def disconnect(self): 77 79 def disconnect(self):