migrated secop_psi drivers to new syntax
- includes all changes up to 'fix inheritance order' from git_mlz
6a32ecf342
Change-Id: Ie3ceee3dbd0a9284b47b1d5b5dbe262eebe8f283
This commit is contained in:
@ -20,65 +20,53 @@
|
||||
# *****************************************************************************
|
||||
"""WAVE FUNCTION LECROY XX: SIGNAL GENERATOR"""
|
||||
|
||||
from secop.core import Readable, Parameter, Override, Command, FloatRange, TupleOf, \
|
||||
HasIodev, StringIO, Done, Attached, IntRange, BoolType, EnumType, StringType, Module, \
|
||||
Property
|
||||
from secop.core import Readable, Parameter, FloatRange, \
|
||||
HasIodev, IntRange, BoolType, EnumType, Module, Property
|
||||
|
||||
|
||||
class Channel(Module):
|
||||
properties = {
|
||||
'channel':Property('choose channel to manipulate',IntRange(1,2)),
|
||||
}
|
||||
parameters = {
|
||||
'freq':
|
||||
Parameter('frequency', FloatRange(1e-6,20e6,unit='Hz'),
|
||||
poll=True, initwrite=True, default=1000),
|
||||
'amp':
|
||||
Parameter('exc_volt_int', FloatRange(0.00,5,unit='Vrms'),
|
||||
poll=True, readonly=False, initwrite=True, default=0.1),
|
||||
'offset':
|
||||
Parameter('offset_volt_int', FloatRange(0.00,10,unit='V'),
|
||||
poll = True, readonly = False, initwrite = True, default = 0.0),
|
||||
'wave':
|
||||
Parameter ('type of wavefunction',
|
||||
EnumType('WaveFunction', SINE=1, SQUARE=2, RAMP=3, PULSE=4, NOISE=5, ARB=6, DC=7),
|
||||
poll=True, readonly=False, default='SINE'),
|
||||
'phase':
|
||||
Parameter('signal phase', FloatRange(0,360,unit='deg'),
|
||||
poll=True, readonly=False, initwrite=True, default=0),
|
||||
'enabled':
|
||||
Parameter('enable output channel', datatype=EnumType('OnOff', OFF=0, ON=1),
|
||||
readonly=False, default='OFF'),
|
||||
'symm':
|
||||
Parameter('wavefunction symmetry', FloatRange(0,100, unit=''),
|
||||
poll=True, readonly =False, default=0),
|
||||
}
|
||||
class Channel(HasIodev, Module):
|
||||
channel = Property('choose channel to manipulate', IntRange(1, 2))
|
||||
|
||||
freq = Parameter('frequency', FloatRange(1e-6, 20e6, unit='Hz'),
|
||||
poll=True, initwrite=True, default=1000)
|
||||
amp = Parameter('exc_volt_int', FloatRange(0.00, 5, unit='Vrms'),
|
||||
poll=True, readonly=False, initwrite=True, default=0.1)
|
||||
offset = Parameter('offset_volt_int', FloatRange(0.00, 10, unit='V'),
|
||||
poll=True, readonly=False, initwrite=True, default=0.0)
|
||||
wave = Parameter('type of wavefunction',
|
||||
EnumType('WaveFunction', SINE=1, SQUARE=2, RAMP=3, PULSE=4, NOISE=5, ARB=6, DC=7),
|
||||
poll=True, readonly=False, default='SINE'),
|
||||
phase = Parameter('signal phase', FloatRange(0, 360, unit='deg'),
|
||||
poll=True, readonly=False, initwrite=True, default=0)
|
||||
enabled = Parameter('enable output channel', datatype=EnumType('OnOff', OFF=0, ON=1),
|
||||
readonly=False, default='OFF')
|
||||
symm = Parameter('wavefunction symmetry', FloatRange(0, 100, unit=''),
|
||||
poll=True, readonly=False, default=0)
|
||||
|
||||
def read_value(self):
|
||||
return self.sendRecv('C%d:BSWV FRQ?' % self.channel)
|
||||
|
||||
|
||||
def write_target(self,value):
|
||||
def write_target(self, value):
|
||||
self.sendRecv('C%d:BSWV FRQ, %g' % (self.channel, str(value)+'Hz'))
|
||||
return value
|
||||
|
||||
#signal wavefunction parameter
|
||||
|
||||
# signal wavefunction parameter
|
||||
def read_wave(self):
|
||||
return self.sendRecv('C%d:BSWV WVTP?' % self.channel)
|
||||
|
||||
def write_wave(self,value): #string value
|
||||
def write_wave(self, value): # string value
|
||||
self.sendRecv('C%d:BSWV WVTP, %s' % (self.channel, value.name))
|
||||
return value
|
||||
|
||||
#signal amplitude parameter
|
||||
|
||||
# signal amplitude parameter
|
||||
def read_amp(self):
|
||||
return self.sendRecv('C%d:BSWV AMP?' % self.channel)
|
||||
|
||||
def write_amp(self,value):
|
||||
def write_amp(self, value):
|
||||
self.sendRecv('C%d:BSWV AMP, %g' % (self.channel, value))
|
||||
return value
|
||||
|
||||
#offset value parameter
|
||||
# offset value parameter
|
||||
def read_offset(self):
|
||||
return self.sendRecv('C%d:BSWV OFST?' % self.channel)
|
||||
|
||||
@ -86,44 +74,41 @@ class Channel(Module):
|
||||
self.sendRecv('C%d:BSWV OFST %g' % (self.channel, value))
|
||||
return value
|
||||
|
||||
|
||||
# channel symmetry
|
||||
# channel symmetry
|
||||
def read_symm(self):
|
||||
return self.sendRecv('C%d:BSWV SYM?' % self.channel)
|
||||
|
||||
def write_symm(self, value):
|
||||
self.comm('C%d:BSWV SYM %g' % (self.channel, value))
|
||||
self.sendRecv('C%d:BSWV SYM %g' % (self.channel, value))
|
||||
return value
|
||||
|
||||
# wave phase parameter
|
||||
# wave phase parameter
|
||||
def read_phase(self):
|
||||
return self.sendRecv('C%d:BSWV PHSE?' % self.channel)
|
||||
|
||||
def write_phase(self, value):
|
||||
self.sendRecv('C%d:BSWV PHSE %g' % (self.channel, str(value)))
|
||||
|
||||
|
||||
return value
|
||||
|
||||
|
||||
# dis/enable output channel
|
||||
|
||||
# dis/enable output channel
|
||||
def read_enabled(self):
|
||||
return self.sendRecv('C%d: OUTP?' % self.channel)
|
||||
|
||||
|
||||
def write_enabled(self, value):
|
||||
self.sendRecv('C%d: OUTP %s' % (self.channel, value.name))
|
||||
return value
|
||||
|
||||
|
||||
# devices are defined as arg less output enable what is defined as arg2
|
||||
|
||||
# devices are defined as arg less output enable what is defined as arg2
|
||||
|
||||
class arg(Readable):
|
||||
pollerClass = None
|
||||
parameters = {
|
||||
'value': Override(datatype=FloatRange(unit='')),
|
||||
}
|
||||
|
||||
|
||||
value = Parameter(datatype=FloatRange(unit=''))
|
||||
|
||||
|
||||
class arg2(Readable):
|
||||
pollerClass = None
|
||||
parameters = {
|
||||
'value': Override(datatype=BoolType(unit='')),
|
||||
}
|
||||
|
||||
value = Parameter(datatype=BoolType())
|
||||
|
Reference in New Issue
Block a user