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

frappy_psi.ah2700: auto create loss module with Pinata

Browse Source 
the loss angle is a separate quantity, which is preferred to
be an extra module. create this automatically.

Change-Id: I97f6be48f3411d8143f2ff85c2c61711fc71e8d6
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33908
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
This commit is contained in:
zolliker 2024-06-11 17:12:47 +02:00
parent 6837b82791
commit 8b27e4012c
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
frappy_psi/ah2700.py
View File

@ -17,7 +17,16 @@
# Module authors: # Module authors:
# Markus Zolliker <markus.zolliker@psi.ch> # Markus Zolliker <markus.zolliker@psi.ch>
# ***************************************************************************** # *****************************************************************************
"""Andeen Hagerling capacitance bridge""" """Andeen Hagerling capacitance bridge
two modules: the capacitance itself and the loss angle
in the configuration file, only the capacitance module needs to be configured,
while the loss module will be created automatically.
the name of the loss module may be configured, or disabled by choosing
an empty name
"""
from frappy.core import FloatRange, HasIO, Parameter, Readable, StringIO, nopoll, \ from frappy.core import FloatRange, HasIO, Parameter, Readable, StringIO, nopoll, \
Attached, Property, StringType Attached, Property, StringType
@ -30,21 +39,22 @@ class Ah2700IO(StringIO):
class Capacitance(HasIO, Pinata, Readable): class Capacitance(HasIO, Pinata, Readable):
value = Parameter('capacitance', FloatRange(unit='pF')) value = Parameter('capacitance', FloatRange(unit='pF'))
freq = Parameter('frequency', FloatRange(unit='Hz'), readonly=False, default=0) freq = Parameter('frequency', FloatRange(unit='Hz'), readonly=False, default=0)
voltage = Parameter('voltage', FloatRange(unit='V'), readonly=False, default=0) voltage = Parameter('voltage', FloatRange(unit='V'), readonly=False, default=0)
loss_name = Property('name of loss modules (default: <name>_loss)', loss_name = Property('''name of loss module (default: <name>_loss)
configure '' to disable the creation of the loss module
''',
StringType(), default='$_loss') StringType(), default='$_loss')
# loss = Parameter('loss', FloatRange(unit='deg'), default=0)
ioClass = Ah2700IO ioClass = Ah2700IO
loss = 0 loss = 0 # not a parameter
def scanModules(self): def scanModules(self):
if self.loss_name: if self.loss_name:
# if loss_name is not empty, we tell the framework to create # if loss_name is not empty, we tell the framework to create
# a Loss module with this name, and config below # a module for the loss with this name, and config below
yield self.loss_name.replace('$', self.name), { yield self.loss_name.replace('$', self.name), {
'cls': Loss, 'cls': Loss,
'description': f'loss value of {self.name}', 'description': f'loss value of {self.name}',
@ -55,9 +65,9 @@ class Capacitance(HasIO, Pinata, Readable):
self.communicate('SERIAL ECHO OFF') self.communicate('SERIAL ECHO OFF')
reply = self.communicate('SI') reply = self.communicate('SI')
if not reply.startswith('F='): # this is probably an error message like "LOSS TOO HIGH" if not reply.startswith('F='): # this is probably an error message like "LOSS TOO HIGH"
self.status = [self.Status.ERROR, reply] self.status = self.Status.ERROR, reply
return self.value return self.value
self.status = [self.Status.IDLE, ''] self.status = self.Status.IDLE, ''
# examples of replies: # examples of replies:
# 'F= 1000.0 HZ C= 0.000001 PF L> 0.0 DS V= 15.0 V' # 'F= 1000.0 HZ C= 0.000001 PF L> 0.0 DS V= 15.0 V'
# 'F= 1000.0 HZ C= 0.0000059 PF L=-0.4 DS V= 15.0 V OVEN' # 'F= 1000.0 HZ C= 0.0000059 PF L=-0.4 DS V= 15.0 V OVEN'
@ -104,6 +114,14 @@ class Loss(Readable):
cap = Attached() cap = Attached()
value = Parameter('loss', FloatRange(unit='deg'), default=0) value = Parameter('loss', FloatRange(unit='deg'), default=0)
def initModule(self):
super().initModule()
self.cap.registerCallbacks(self, ['status']) # auto update status
def update_value(self, _):
# value is always changed shortly after loss
self.value = self.cap.loss
@nopoll @nopoll
def read_value(self): def read_value(self):
self.cap.read_value() self.cap.read_value()