diff --git a/cfg/main/ill1_cfg.py b/cfg/main/ill1_cfg.py index d8de959..120b797 100644 --- a/cfg/main/ill1_cfg.py +++ b/cfg/main/ill1_cfg.py @@ -12,7 +12,7 @@ Mod('sea_main', Mod('tt', 'frappy_psi.sea.SeaDrivable', '', io='sea_main', - meaning=['temperature_regulation', 20], + meaning=['temperature_regulation', 27], sea_object='tt', rel_paths=['tm', '.', 'set', 'dblctrl'], ) diff --git a/cfg/main/ill2_cfg.py b/cfg/main/ill2_cfg.py index 9775d63..ab7db25 100644 --- a/cfg/main/ill2_cfg.py +++ b/cfg/main/ill2_cfg.py @@ -12,7 +12,7 @@ Mod('sea_main', Mod('tt', 'frappy_psi.sea.SeaDrivable', '', io='sea_main', - meaning=['temperature_regulation', 20], + meaning=['temperature_regulation', 27], sea_object='tt', rel_paths=['tm', '.', 'set', 'dblctrl'], ) diff --git a/cfg/main/ill3_cfg.py b/cfg/main/ill3_cfg.py index 616e918..13ff73e 100644 --- a/cfg/main/ill3_cfg.py +++ b/cfg/main/ill3_cfg.py @@ -12,7 +12,7 @@ Mod('sea_main', Mod('tt', 'frappy_psi.sea.SeaDrivable', '', io='sea_main', - meaning=['temperature_regulation', 20], + meaning=['temperature_regulation', 27], sea_object='tt', rel_paths=['tm', '.', 'set', 'dblctrl'], ) diff --git a/cfg/main/ill4_cfg.py b/cfg/main/ill4_cfg.py index 9fd8928..e82d470 100644 --- a/cfg/main/ill4_cfg.py +++ b/cfg/main/ill4_cfg.py @@ -12,7 +12,7 @@ Mod('sea_main', Mod('tt', 'frappy_psi.sea.SeaDrivable', '', io='sea_main', - meaning=['temperature_regulation', 20], + meaning=['temperature_regulation', 27], sea_object='tt', rel_paths=['tm', '.', 'set', 'dblctrl'], ) diff --git a/cfg/main/ill5_cfg.py b/cfg/main/ill5_cfg.py index 3e5b907..93579fa 100644 --- a/cfg/main/ill5_cfg.py +++ b/cfg/main/ill5_cfg.py @@ -12,7 +12,7 @@ Mod('sea_main', Mod('tt', 'frappy_psi.sea.SeaDrivable', '', io='sea_main', - meaning=['temperature_regulation', 20], + meaning=['temperature_regulation', 27], sea_object='tt', rel_paths=['tm', '.', 'set', 'dblctrl'], ) diff --git a/cfg/main/ill5pgas5_cfg.py b/cfg/main/ill5pgas5_cfg.py index 7c96527..9c2d222 100644 --- a/cfg/main/ill5pgas5_cfg.py +++ b/cfg/main/ill5pgas5_cfg.py @@ -12,7 +12,7 @@ Mod('sea_main', Mod('tt', 'frappy_psi.sea.SeaDrivable', '', io='sea_main', - meaning=['temperature_regulation', 20], + meaning=['temperature_regulation', 27], sea_object='tt', rel_paths=['tm', '.', 'set', 'dblctrl'], ) diff --git a/cfg/main/jtccr_cfg.py b/cfg/main/jtccr_cfg.py index 6dbee89..43079da 100644 --- a/cfg/main/jtccr_cfg.py +++ b/cfg/main/jtccr_cfg.py @@ -12,7 +12,7 @@ Mod('sea_main', Mod('tt', 'frappy_psi.sea.SeaDrivable', '', io='sea_main', - meaning=['temperature_regulation', 20], + meaning=['temperature_regulation', 27], sea_object='tt', rel_paths=['tt', 'set'], ) diff --git a/cfg/main/ma02_cfg.py b/cfg/main/ma02_cfg.py index ec90cf4..c745fed 100644 --- a/cfg/main/ma02_cfg.py +++ b/cfg/main/ma02_cfg.py @@ -12,7 +12,7 @@ Mod('sea_main', Mod('tt', 'frappy_psi.sea.SeaDrivable', '', io='sea_main', - meaning=['temperature_regulation', 20], + meaning=['temperature_regulation', 27], sea_object='tt', rel_paths=['tm', '.', 'set', 'dblctrl'], ) diff --git a/cfg/main/ma10_cfg.py b/cfg/main/ma10_cfg.py index de35d84..bab61ba 100644 --- a/cfg/main/ma10_cfg.py +++ b/cfg/main/ma10_cfg.py @@ -12,7 +12,7 @@ Mod('sea_main', Mod('tt', 'frappy_psi.sea.SeaDrivable', '', io='sea_main', - meaning=['temperature_regulation', 20], + meaning=['temperature_regulation', 27], sea_object='tt', rel_paths=['tm', '.', 'set', 'dblctrl'], ) diff --git a/cfg/main/ma10heat_cfg.py b/cfg/main/ma10heat_cfg.py index 880af68..e1cb2f4 100644 --- a/cfg/main/ma10heat_cfg.py +++ b/cfg/main/ma10heat_cfg.py @@ -12,7 +12,7 @@ Mod('sea_main', Mod('ts', 'frappy_psi.sea.SeaDrivable', '', io='sea_main', - meaning=['temperature_regulation', 20], + meaning=['temperature_regulation', 27], sea_object='tt', rel_paths=['ts', 'set'] ) diff --git a/cfg/main/ma10high_t_cfg.py b/cfg/main/ma10high_t_cfg.py index 29edd9a..7a0b938 100644 --- a/cfg/main/ma10high_t_cfg.py +++ b/cfg/main/ma10high_t_cfg.py @@ -13,7 +13,7 @@ Mod('th', 'frappy_psi.sea.SeaReadable', 'sample heater temperature', io='sea_main', - meaning=['temperature_regulation', 20], + meaning=['temperature_regulation', 27], sea_object='tt', rel_paths=['ts', 'setsamp'] ) diff --git a/cfg/main/ma11_cfg.py b/cfg/main/ma11_cfg.py index bc3de92..cbe38cd 100644 --- a/cfg/main/ma11_cfg.py +++ b/cfg/main/ma11_cfg.py @@ -12,7 +12,7 @@ Mod('sea_main', Mod('tt', 'frappy_psi.sea.SeaDrivable', '', io='sea_main', - meaning=['temperature_regulation', 20], + meaning=['temperature_regulation', 27], sea_object='tt', rel_paths=['tm', '.', 'set', 'dblctrl'], ) diff --git a/cfg/main/ma15_cfg.py b/cfg/main/ma15_cfg.py index aa469a3..1b63405 100644 --- a/cfg/main/ma15_cfg.py +++ b/cfg/main/ma15_cfg.py @@ -10,7 +10,7 @@ Mod('sea_main', Mod('tt', 'frappy_psi.sea.SeaDrivable', '', io = 'sea_main', - meaning=['temperature_regulation', 20], + meaning=['temperature_regulation', 27], sea_object = 'tt', rel_paths=['tm', '.', 'set', 'dblctrl'], ) diff --git a/cfg/main/ma6_cfg.py b/cfg/main/ma6_cfg.py index ce9683d..a6e4ec7 100644 --- a/cfg/main/ma6_cfg.py +++ b/cfg/main/ma6_cfg.py @@ -12,7 +12,7 @@ Mod('sea_main', Mod('tt', 'frappy_psi.sea.SeaDrivable', '', io='sea_main', - meaning=['temperature_regulation', 20], + meaning=['temperature_regulation', 27], sea_object='tt', rel_paths=['tm', '.', 'set', 'dblctrl'], ) diff --git a/cfg/main/ma6_sampleheat_cfg.py b/cfg/main/ma6_sampleheat_cfg.py index 880db4e..c48b911 100644 --- a/cfg/main/ma6_sampleheat_cfg.py +++ b/cfg/main/ma6_sampleheat_cfg.py @@ -12,7 +12,7 @@ Mod('sea_main', Mod('tt', 'frappy_psi.sea.SeaDrivable', '', io='sea_main', - meaning=['temperature_regulation', 20], + meaning=['temperature_regulation', 27], sea_object='tt', rel_paths=['tm', '.', 'set', 'dblctrl'], ) diff --git a/cfg/main/ma7_piezo_cfg.py b/cfg/main/ma7_piezo_cfg.py index dfb45ae..09ec3fc 100644 --- a/cfg/main/ma7_piezo_cfg.py +++ b/cfg/main/ma7_piezo_cfg.py @@ -12,7 +12,7 @@ Mod('sea_main', Mod('tt', 'frappy_psi.sea.SeaDrivable', '', io='sea_main', - meaning=['temperature_regulation', 20], + meaning=['temperature_regulation', 27], sea_object='tt', rel_paths=['tm', '.', 'set', 'dblctrl', 'voltage'], extra_modules=['manualpower'], diff --git a/cfg/main/ma7_sampleheat_cfg.py b/cfg/main/ma7_sampleheat_cfg.py index b209d90..ef3fda2 100644 --- a/cfg/main/ma7_sampleheat_cfg.py +++ b/cfg/main/ma7_sampleheat_cfg.py @@ -12,7 +12,7 @@ Mod('sea_main', Mod('tt', 'frappy_psi.sea.SeaDrivable', '', io='sea_main', - meaning=['temperature_regulation', 20], + meaning=['temperature_regulation', 27], sea_object='tt', rel_paths=['tm', '.', 'set', 'dblctrl'], ) diff --git a/cfg/main/ma7_thermalc_cfg.py b/cfg/main/ma7_thermalc_cfg.py index a98d6b8..d91b24c 100644 --- a/cfg/main/ma7_thermalc_cfg.py +++ b/cfg/main/ma7_thermalc_cfg.py @@ -16,7 +16,7 @@ Mod('sea_main', Mod('tt', 'frappy_psi.sea.SeaDrivable', '', - meaning=['temperature_regulation', 20], + meaning=['temperature_regulation', 27], io='sea_main', sea_object='tt', rel_paths=['tm', '.', 'set', 'dblctrl'], diff --git a/cfg/main/ma7two_cfg.py b/cfg/main/ma7two_cfg.py index 35f8b6a..b53dce5 100644 --- a/cfg/main/ma7two_cfg.py +++ b/cfg/main/ma7two_cfg.py @@ -12,7 +12,7 @@ Mod('sea_main', Mod('tt', 'frappy_psi.sea.SeaDrivable', '', io='sea_main', - meaning=['temperature_regulation', 20], + meaning=['temperature_regulation', 27], sea_object='tt', rel_paths=['tm', '.', 'set', 'dblctrl'], ) diff --git a/cfg/main/mb11_cfg.py b/cfg/main/mb11_cfg.py index 647beed..9d0ea4d 100644 --- a/cfg/main/mb11_cfg.py +++ b/cfg/main/mb11_cfg.py @@ -25,7 +25,7 @@ Mod('ips', Mod('T_stat', 'frappy_psi.mercury.TemperatureAutoFlow', 'static heat exchanger temperature', - meaning=['temperature_regulation', 20], + meaning=['temperature_regulation', 27], output_module='htr_stat', needle_valve='p_stat', slot='DB6.T1', diff --git a/cfg/main/mb11std_cfg.py b/cfg/main/mb11std_cfg.py index 3b4a8e1..cc809f9 100644 --- a/cfg/main/mb11std_cfg.py +++ b/cfg/main/mb11std_cfg.py @@ -23,7 +23,7 @@ Mod('ips', Mod('T_stat', 'frappy_psi.mercury.TemperatureAutoFlow', 'static heat exchanger temperature', - meaning=['temperature_regulation', 20], + meaning=['temperature_regulation', 27], output_module='htr_stat', needle_valve='p_stat', slot='DB6.T1', diff --git a/cfg/main/ori2_cfg.py b/cfg/main/ori2_cfg.py index 92e1a97..8cb4011 100644 --- a/cfg/main/ori2_cfg.py +++ b/cfg/main/ori2_cfg.py @@ -12,7 +12,7 @@ Mod('sea_main', Mod('tt', 'frappy_psi.sea.SeaDrivable', '', io='sea_main', - meaning=['temperature_regulation', 20], + meaning=['temperature_regulation', 27], sea_object='tt', rel_paths=['tm', '.', 'set', 'dblctrl'], ) diff --git a/cfg/main/ori3_cfg.py b/cfg/main/ori3_cfg.py index 0ff0e3e..15706f3 100644 --- a/cfg/main/ori3_cfg.py +++ b/cfg/main/ori3_cfg.py @@ -12,7 +12,7 @@ Mod('sea_main', Mod('tt', 'frappy_psi.sea.SeaDrivable', '', io='sea_main', - meaning=['temperature_regulation', 20], + meaning=['temperature_regulation', 27], sea_object='tt', rel_paths=['tm', '.', 'set', 'dblctrl'], ) diff --git a/cfg/main/ori4_cfg.py b/cfg/main/ori4_cfg.py index 40c2c0c..169b5bf 100644 --- a/cfg/main/ori4_cfg.py +++ b/cfg/main/ori4_cfg.py @@ -12,7 +12,7 @@ Mod('sea_main', Mod('tt', 'frappy_psi.sea.SeaDrivable', '', io='sea_main', - meaning=['temperature_regulation', 20], + meaning=['temperature_regulation', 27], sea_object='tt', rel_paths=['tm', '.', 'set', 'dblctrl'], ) diff --git a/cfg/main/ori6_cfg.py b/cfg/main/ori6_cfg.py index b4e18ca..6e65cb1 100644 --- a/cfg/main/ori6_cfg.py +++ b/cfg/main/ori6_cfg.py @@ -12,7 +12,7 @@ Mod('sea_main', Mod('tt', 'frappy_psi.sea.SeaDrivable', '', io='sea_main', - meaning=['temperature_regulation', 20], + meaning=['temperature_regulation', 27], sea_object='tt', rel_paths=['tm', '.', 'set', 'dblctrl'], ) diff --git a/cfg/main/ori7_cfg.py b/cfg/main/ori7_cfg.py index 5bcdd8b..ea3477d 100644 --- a/cfg/main/ori7_cfg.py +++ b/cfg/main/ori7_cfg.py @@ -12,7 +12,7 @@ Mod('sea_main', Mod('tt', 'frappy_psi.sea.SeaDrivable', '', io = 'sea_main', - meaning=['temperature_regulation', 20], + meaning=['temperature_regulation', 27], sea_object = 'tt', rel_paths=['tm', '.', 'set', 'dblctrl'], ) diff --git a/cfg/main/variox_cfg.py b/cfg/main/variox_cfg.py index ac0bb5e..f7906ef 100644 --- a/cfg/main/variox_cfg.py +++ b/cfg/main/variox_cfg.py @@ -12,7 +12,7 @@ Mod('sea_main', Mod('tt', 'frappy_psi.sea.SeaDrivable', '', io='sea_main', - meaning=['temperature_regulation', 20], + meaning=['temperature_regulation', 27], sea_object='tt', rel_paths=['tm', '.', 'set', 'dblctrl'], ) diff --git a/cfg/main/varioxb_cfg.py b/cfg/main/varioxb_cfg.py index f4c7577..4fc66ef 100644 --- a/cfg/main/varioxb_cfg.py +++ b/cfg/main/varioxb_cfg.py @@ -18,7 +18,7 @@ Mod('itc2', Mod('T_stat', 'frappy_psi.mercury.TemperatureAutoFlow', 'static heat exchanger temperature', - meaning=['temperature_regulation', 20], + meaning=['temperature_regulation', 27], output_module='htr_stat', needle_valve='p_stat', slot='DB6.T1', diff --git a/cfg/stick/ma11stick_cfg.py b/cfg/stick/ma11stick_cfg.py index 4e0a895..ffcddb0 100644 --- a/cfg/stick/ma11stick_cfg.py +++ b/cfg/stick/ma11stick_cfg.py @@ -21,7 +21,7 @@ Mod('tsam', Mod('ts', 'frappy_psi.parmod.Converging', 'stick T (controlled)', - meaning=['temperature', 30], + meaning=['temperature', 25], unit='K', read='tsam.value', write='tsam.setsamp', diff --git a/cfg/stick/ma6stick_cfg.py b/cfg/stick/ma6stick_cfg.py index c993fa9..8c29d31 100644 --- a/cfg/stick/ma6stick_cfg.py +++ b/cfg/stick/ma6stick_cfg.py @@ -16,7 +16,7 @@ Mod('ts', json_file='ma6.config.json', sea_object='tt', rel_paths=['ts', 'setsamp'], - meaning=['temperature', 20], + meaning=['temperature', 30], ) @@ -24,11 +24,10 @@ Mod('ts', Mod('ts', 'frappy_psi.parmod.Converging', 'drivable stick T using setsamp', - meaning=['temperature', 30], + meaning=['temperature', 25], unit='K', read='tsam.value', write='tsam.setsamp', - meaning=['temperature', 20], settling_time=20, tolerance=1, )