linse/frappy
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

frappy_psi/ls372: add changing pid

Browse Source 
Change-Id: I8768b1e6609a42553b8e98866540fe33d1b5cd89
This commit is contained in:
zolliker 2024-06-19 17:17:44 +02:00
parent fa37b43be2
commit 4da6aa95d7
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
frappy_psi/ls372.py
View File

@ -31,6 +31,7 @@ import frappy.io
from frappy.datatypes import BoolType, EnumType, FloatRange, IntRange from frappy.datatypes import BoolType, EnumType, FloatRange, IntRange
from frappy.lib import formatStatusBits from frappy.lib import formatStatusBits
from frappy.core import Command, Drivable, Parameter, Property, CommonReadHandler, CommonWriteHandler from frappy.core import Command, Drivable, Parameter, Property, CommonReadHandler, CommonWriteHandler
from frappy.extparams import StructParam
from frappy_psi.convergence import HasConvergence from frappy_psi.convergence import HasConvergence
from frappy_psi.channelswitcher import Channel, ChannelSwitcher from frappy_psi.channelswitcher import Channel, ChannelSwitcher
@ -215,7 +216,7 @@ class ResChannel(Channel):
def change(self, command, *args): def change(self, command, *args):
cmd, _, qarg = command.partition(' ') cmd, _, qarg = command.partition(' ')
args = ','.join([qarg] + [f'{a:g}' for a in args]) args = ','.join([qarg] + [f'{a:g}' for a in args])
return parse(self.switcher.communicate(f'{command}?{qarg};{command} {args}')) return parse(self.switcher.communicate(f'{cmd} {args};{cmd}?{qarg}'))
def read_status(self): def read_status(self):
if not self.enabled: if not self.enabled:
@ -360,7 +361,6 @@ class ResChannel(Channel):
return settle return settle
class TemperatureChannel(ResChannel): class TemperatureChannel(ResChannel):
raw = Parameter('raw reistance value', FloatRange(unit='Ohm')) raw = Parameter('raw reistance value', FloatRange(unit='Ohm'))
value = Parameter('temperature sensor', FloatRange(0, unit='K')) value = Parameter('temperature sensor', FloatRange(0, unit='K'))
@ -384,6 +384,12 @@ class TemperatureLoop(HasConvergence, TemperatureChannel, Drivable):
minheater = Parameter('minimal heater current', FloatRange(0, 0.01, unit='A'), readonly=False, default=0) minheater = Parameter('minimal heater current', FloatRange(0, 0.01, unit='A'), readonly=False, default=0)
HTRRNG = {n: i for i, n in enumerate(['off', '30uA', '100uA', '300uA', '1mA', '3mA', '10mA', '30mA', '100mA'])} HTRRNG = {n: i for i, n in enumerate(['off', '30uA', '100uA', '300uA', '1mA', '3mA', '10mA', '30mA', '100mA'])}
htrrng = Parameter('', EnumType(HTRRNG), readonly=False) htrrng = Parameter('', EnumType(HTRRNG), readonly=False)
ctrlpars = StructParam('control parameters struct', {
'p': Parameter('proportional heat parameter', FloatRange()),
'i': Parameter('integral heat parameter', FloatRange()),
'd': Parameter('derivative heat parameter', FloatRange()),
}, readonly=False)
_control_active = False _control_active = False
def doPoll(self): def doPoll(self):
@ -440,10 +446,10 @@ class TemperatureLoop(HasConvergence, TemperatureChannel, Drivable):
self.communicate(f'SETP {self.loop},{target};*OPC?') self.communicate(f'SETP {self.loop},{target};*OPC?')
return target return target
#def write_ctrlpars(self, ctrlpars): def write_ctrlpars(self, ctrlpars):
# p, i, d = self.change(f'PID {self.loop}', ctrlpars['p'], ctrlpars['i'], ctrlpars['d']) p, i, d = self.change(f'PID {self.loop}', ctrlpars['p'], ctrlpars['i'], ctrlpars['d'])
# return {'p': p, 'i': i, 'd': d} return {'p': p, 'i': i, 'd': d}
#def read_ctrlpars(self): def read_ctrlpars(self):
# p, i, d = self.query(f'PID? {self.loop}') p, i, d = self.query(f'PID?{self.loop}')
# return {'p': p, 'i': i, 'd': d} return {'p': p, 'i': i, 'd': d}