diff --git a/cfg/stick/ma11stick_cfg.py b/cfg/stick/ma11stick_cfg.py index e9ac746..e681c35 100644 --- a/cfg/stick/ma11stick_cfg.py +++ b/cfg/stick/ma11stick_cfg.py @@ -22,8 +22,8 @@ Mod('ts', 'frappy_psi.parmod.Converging', 'virtual stick T', unit='K', - value_param='tsam.value', - target_param='tsam.setsamp', + read='tsam.value', + write='tsam.setsamp', meaning=['temperature', 20], settling_time=20, tolerance=1, diff --git a/cfg/stick/ma7combi_cfg.py b/cfg/stick/ma7combi_cfg.py deleted file mode 100644 index 82763d0..0000000 --- a/cfg/stick/ma7combi_cfg.py +++ /dev/null @@ -1,72 +0,0 @@ -Node('ma7.stick.sea.psi.ch', - 'MA7 standard sample stick', -) - -Mod('sea_stick', - 'frappy_psi.sea.SeaClient', - 'SEA stick connection', - config='ma7.stick', - service='stick', -) - -Mod('ts_sea', - 'frappy_psi.sea.SeaReadable', - 'sample stick temperature', - io='sea_stick', - json_file='ma7.config.json', - sea_object='tt', - rel_paths=['ts', 'setsamp'], - # export=False, -) - -Mod('tm_sea', - 'frappy_psi.sea.SeaReadable', - 'sample stick temperature', - io='sea_stick', - json_file='ma7.config.json', - sea_object='tt', - rel_paths=['tm', 'set'], - # export=False, -) - -Mod('ts_writ', - 'frappy_psi.parmod.ParWrit', - 'writable version of ts', - unit='K', - value_param='ts_sea.value', - target_param='ts_sea.setsamp', -) - -Mod('tm_writ', - 'frappy_psi.parmod.ParWrit', - 'writable version of tm', - unit='K', - value_param='tm_sea.value', - target_param='tm_sea.set', -) - -Mod('sam_htr', - 'frappy_psi.parmod.Par', - 'htr module version', - unit='W', - value_param='ts_sea.power', -) - -Mod('vti_htr', - 'frappy_psi.parmod.Par', - 'htr module version', - unit='W', - value_param='tm_sea.power', -) - -Mod('ts', - 'frappy_psi.parmod.CombinedSampleVti', - 'drivable stick T using setsamp', - sample='ts_writ', - sample_htr='sam_htr', - vti='tm_writ', - vti_htr='vti_htr', - meaning=['temperature', 20], - settling_time=20, - tolerance=1, -) diff --git a/cfg/stick/ma7stick_cfg.py b/cfg/stick/ma7stick_cfg.py index 9373233..ca3e177 100644 --- a/cfg/stick/ma7stick_cfg.py +++ b/cfg/stick/ma7stick_cfg.py @@ -22,8 +22,8 @@ Mod('ts', 'frappy_psi.parmod.Converging', 'drivable stick T using setsamp', unit='K', - value_param='ts_sea.value', - target_param='ts_sea.setsamp', + read='ts_sea.value', + write='ts_sea.setsamp', meaning=['temperature', 20], settling_time=20, tolerance=1,