fix ppms with proxy
- proxy: remote parameter status should overddide datatype from ProxyModule.status - ppms: create PpmsDrivable instead of importing from (PpmsBase, Drivable). Order matters for status parameter! - update cfg files Change-Id: If8fc263cffb903d8b3c1a93a089dcac3597d13a0 Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30512 Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de> Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
Node('filtered.PPMS.psi.ch',
|
||||
'filtered PPMS at PSI',
|
||||
'localhost:5002',
|
||||
'tcp://5002',
|
||||
)
|
||||
|
||||
|
||||
@@ -16,6 +16,6 @@ Mod('mf',
|
||||
remote_class = 'frappy_psi.ppms.Field',
|
||||
io = 'secnode',
|
||||
|
||||
value = Param(min = -0.1, max = 0.1),
|
||||
target = Param(min = -8, max = 8),
|
||||
value = Param(),
|
||||
target = Param(min=-0.1, max=0.1),
|
||||
)
|
||||
|
||||
@@ -1,16 +1,20 @@
|
||||
Node('r3',
|
||||
'temp sensor on 3He system',
|
||||
'tcp://pc12694:5000',
|
||||
cls = 'frappy.core.Proxy',
|
||||
remote_class = 'frappy_mlz.amagnet.GarfieldMagnet',
|
||||
#remote_class = 'frappy.core.Readable',
|
||||
Node('softcal.demo.example',
|
||||
'convert r2 from PPMS to a temperature',
|
||||
'tcp://5001',
|
||||
)
|
||||
|
||||
Mod('r2',
|
||||
'frappy.core.Proxy',
|
||||
'convert r2 from PPMS to a temperature',
|
||||
remote_class = 'frappy.core.Readable',
|
||||
uri = 'tcp://localhost:5000',
|
||||
export = False,
|
||||
)
|
||||
|
||||
Mod('t3',
|
||||
Mod('T2',
|
||||
'frappy_psi.softcal.Sensor',
|
||||
'',
|
||||
value = Param(unit = 'K'),
|
||||
rawsensor = 'r3',
|
||||
rawsensor = 'r2',
|
||||
calib = 'X131346',
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user