diff --git a/cfg/main/ma7_cfg.py b/cfg/main/ma7_cfg.py index ae7e72b..16f6203 100644 --- a/cfg/main/ma7_cfg.py +++ b/cfg/main/ma7_cfg.py @@ -13,7 +13,7 @@ Mod('tt', 'frappy_psi.sea.SeaDrivable', '', io='sea_main', sea_object='tt', - rel_paths=['.', 'tm'], + rel_paths=['tm', 'set', 'dblctrl'], ) Mod('cc', diff --git a/cfg/main/ma7_sampleheat_cfg.py b/cfg/main/ma7_sampleheat_cfg.py index 4bbdd64..a58cefb 100644 --- a/cfg/main/ma7_sampleheat_cfg.py +++ b/cfg/main/ma7_sampleheat_cfg.py @@ -36,8 +36,8 @@ Mod('ts', 'frappy_psi.parmod.Converging', 'test for parmod', unit='K', - read='th.value', - write='th.setsamp', + value_param='th.value', + target_param='th.setsamp', meaning=['temperature', 20], settling_time=20, tolerance=1, diff --git a/cfg/stick/ma11stick_cfg.py b/cfg/stick/ma11stick_cfg.py index e681c35..e9ac746 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', - read='tsam.value', - write='tsam.setsamp', + value_param='tsam.value', + target_param='tsam.setsamp', meaning=['temperature', 20], settling_time=20, tolerance=1, diff --git a/cfg/stick/ma7stick_cfg.py b/cfg/stick/ma7stick_cfg.py index c8930e3..9373233 100644 --- a/cfg/stick/ma7stick_cfg.py +++ b/cfg/stick/ma7stick_cfg.py @@ -9,7 +9,7 @@ Mod('sea_stick', service='stick', ) -Mod('tsam', +Mod('ts_sea', 'frappy_psi.sea.SeaReadable', 'sample stick temperature', io='sea_stick', @@ -22,8 +22,8 @@ Mod('ts', 'frappy_psi.parmod.Converging', 'drivable stick T using setsamp', unit='K', - read='tsam.value', - write='tsam.setsamp', + value_param='ts_sea.value', + target_param='ts_sea.setsamp', meaning=['temperature', 20], settling_time=20, tolerance=1, diff --git a/cfg/stick/ovenstick_cfg.py b/cfg/stick/ovenstick_cfg.py index ad5a46d..1afcce0 100644 --- a/cfg/stick/ovenstick_cfg.py +++ b/cfg/stick/ovenstick_cfg.py @@ -9,10 +9,23 @@ Mod('sea_stick', service='stick', ) -Mod('ts', - 'frappy_psi.sea.SeaReadable', '', +Mod('tsam', + 'frappy_psi.sea.SeaReadable', + 'sample stick temperature', io='sea_stick', - sea_object='tt', json_file='ma7.config.json', - rel_paths=['ts'], + sea_object='tt', + rel_paths=['ts', 'setsamp'] ) + +Mod('ts', + 'frappy_psi.parmod.Converging', + 'drivable stick T using setsamp', + unit='K', + value_param='tsam.value', + target_param='tsam.setsamp', + meaning=['temperature', 20], + settling_time=20, + tolerance=1, +) +