From 11a65b485bd5d35453e12677ac71e07a8758bd69 Mon Sep 17 00:00:00 2001 From: l_samenv Date: Thu, 14 Nov 2024 15:19:24 +0100 Subject: [PATCH] fix ah2700 / ah2550 settings --- cfg/addons/ah2700_cfg.py | 2 +- cfg/addons/ah2700sea_cfg.py | 18 +++++++++++++++++- cfg/main/mb11std_cfg.py | 1 + cfg/sea/ah2550.addon.json | 14 ++++++++++++++ 4 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 cfg/sea/ah2550.addon.json diff --git a/cfg/addons/ah2700_cfg.py b/cfg/addons/ah2700_cfg.py index 73616c4..2871f6f 100644 --- a/cfg/addons/ah2700_cfg.py +++ b/cfg/addons/ah2700_cfg.py @@ -5,5 +5,5 @@ Node('ah2700.frappy.psi.ch', Mod('cap', 'frappy_psi.ah2700.Capacitance', 'capacitance', - uri='lollypop-ts:3002', + uri='dil4-ts.psi.ch:3008', ) diff --git a/cfg/addons/ah2700sea_cfg.py b/cfg/addons/ah2700sea_cfg.py index 51ac13f..741f7ed 100644 --- a/cfg/addons/ah2700sea_cfg.py +++ b/cfg/addons/ah2700sea_cfg.py @@ -2,6 +2,8 @@ Node('ah2700.addon.sea.psi.ch', 'Andeen Hagerlin 2700 Capacitance Bridge using SEA', ) +sea_cfg='ah2700.addon' + Mod('sea_addons', 'frappy_psi.sea.SeaClient', 'SEA connection to mbe_ah2700', @@ -10,10 +12,24 @@ Mod('sea_addons', service='addons', ) -Mod('cap', +Mod('ah', 'frappy_psi.sea.SeaReadable', '', io='sea_addons', sea_object='cap', + extra_modules = ['cap', 'loss'] +) + +Mod('cap', + 'frappy_psi.sea.SeaReadable', '', + io='sea_addons', + single_module='ah.cap', + value=Param(fmtstr='%.12g'), +) + +Mod('loss', + 'frappy_psi.sea.SeaReadable', '', + io='sea_addons', + single_module='ah.loss', ) Mod('capslope', diff --git a/cfg/main/mb11std_cfg.py b/cfg/main/mb11std_cfg.py index a64d767..3b4a8e1 100644 --- a/cfg/main/mb11std_cfg.py +++ b/cfg/main/mb11std_cfg.py @@ -46,6 +46,7 @@ Mod('ts', slot='MB1.T1', io='itc1', tolerance=1.0, + visibility='expert', ) Mod('htr_sample', diff --git a/cfg/sea/ah2550.addon.json b/cfg/sea/ah2550.addon.json new file mode 100644 index 0000000..b9559a4 --- /dev/null +++ b/cfg/sea/ah2550.addon.json @@ -0,0 +1,14 @@ +{"cap": {"base": "/cap", "params": [{"path": "", "type": "none", "kids": 8}, +{"path": "send", "type": "text", "readonly": false, "cmd": "cap send", "visibility": 3}, +{"path": "status", "type": "text", "visibility": 3}, +{"path": "cap", "type": "float"}, +{"path": "loss", "type": "float"}, +{"path": "period", "type": "float", "readonly": false, "cmd": "cap period"}, +{"path": "V", "type": "float", "readonly": false, "cmd": "cap V"}, +{"path": "average", "type": "int", "readonly": false, "cmd": "cap average"}]}, "capslope": {"base": "/capslope", "params": [{"path": "", "type": "float", "kids": 6}, +{"path": "send", "type": "text", "readonly": false, "cmd": "capslope send", "visibility": 3}, +{"path": "status", "type": "text", "visibility": 3}, +{"path": "node", "type": "text", "readonly": false, "cmd": "capslope node"}, +{"path": "unit", "type": "float", "readonly": false, "cmd": "capslope unit", "description": "unit=60: mainunits/minutes, unit=1: mainunits/sec"}, +{"path": "ref", "type": "float", "readonly": false, "cmd": "capslope ref"}, +{"path": "buffersize", "type": "float", "readonly": false, "cmd": "capslope buffersize"}]}}