diff --git a/main/jtccr_cfg.py b/main/jtccr_cfg.py index 0d89e63..fb7712a 100644 --- a/main/jtccr_cfg.py +++ b/main/jtccr_cfg.py @@ -79,5 +79,3 @@ Mod('roughing', 'frappy_psi.epc8210.Switch', 'roughing pump switch', io='io_pwsw addr=4, visibility='expert') Mod('turbo', 'frappy_psi.epc8210.Switch', 'turbo pump switch', io='io_pwsw', addr=5, visibility='expert') - - diff --git a/main/ma02_cfg.py b/main/ma02_cfg.py index 638e180..1ddfc5f 100644 --- a/main/ma02_cfg.py +++ b/main/ma02_cfg.py @@ -10,11 +10,12 @@ Mod('sea_main', ) Mod('tt', - 'frappy_psi.sea.SeaDrivable', '', + 'frappy_psi.sea.LscDrivable', '', io='sea_main', meaning=['temperature_regulation', 27], sea_object='tt', - rel_paths=['tm', '.', 'set', 'dblctrl'], + sensor_path='tm', + set_path='set', ) Mod('cc', diff --git a/main/ma10_cfg.py b/main/ma10_cfg.py index a572165..a094a02 100644 --- a/main/ma10_cfg.py +++ b/main/ma10_cfg.py @@ -10,11 +10,12 @@ Mod('sea_main', ) Mod('tt', - 'frappy_psi.sea.SeaDrivable', '', + 'frappy_psi.sea.LscDrivable', '', io='sea_main', meaning=['temperature_regulation', 27], sea_object='tt', - rel_paths=['tm', '.', 'set', 'dblctrl'], + sensor_path='tm', + set_path='set', ) Mod('cc', diff --git a/main/ma11_cfg.py b/main/ma11_cfg.py index 000c962..a74dfd5 100644 --- a/main/ma11_cfg.py +++ b/main/ma11_cfg.py @@ -10,11 +10,12 @@ Mod('sea_main', ) Mod('tt', - 'frappy_psi.sea.SeaDrivable', '', + 'frappy_psi.sea.LscDrivable', '', io='sea_main', meaning=['temperature_regulation', 27], sea_object='tt', - rel_paths=['tm', '.', 'set', 'dblctrl'], + sensor_path='tm', + set_path='set', ) Mod('cc', diff --git a/main/ma15_cfg.py b/main/ma15_cfg.py index a5f3c30..7f09d1b 100644 --- a/main/ma15_cfg.py +++ b/main/ma15_cfg.py @@ -8,11 +8,12 @@ Mod('sea_main', service = 'main', ) Mod('tt', - 'frappy_psi.sea.SeaDrivable', '', - io = 'sea_main', + 'frappy_psi.sea.LscDrivable', '', + io='sea_main', meaning=['temperature_regulation', 27], - sea_object = 'tt', - rel_paths=['tm', '.', 'set', 'dblctrl'], + sea_object='tt', + sensor_path='tm', + set_path='set', ) Mod('cc', 'frappy_psi.sea.SeaReadable', '', diff --git a/main/ma6_cfg.py b/main/ma6_cfg.py index 8af0267..e4971fa 100644 --- a/main/ma6_cfg.py +++ b/main/ma6_cfg.py @@ -10,11 +10,12 @@ Mod('sea_main', ) Mod('tt', - 'frappy_psi.sea.SeaDrivable', '', + 'frappy_psi.sea.LscDrivable', '', io='sea_main', meaning=['temperature_regulation', 27], sea_object='tt', - rel_paths=['tm', '.', 'set', 'dblctrl'], + sensor_path='tm', + set_path='set', ) Mod('cc', diff --git a/main/ma6_sampleheat_cfg.py b/main/ma6_sampleheat_cfg.py index a92d27c..ad9811a 100644 --- a/main/ma6_sampleheat_cfg.py +++ b/main/ma6_sampleheat_cfg.py @@ -10,11 +10,12 @@ Mod('sea_main', ) Mod('tt', - 'frappy_psi.sea.SeaDrivable', '', + 'frappy_psi.sea.LscDrivable', '', io='sea_main', meaning=['temperature_regulation', 27], sea_object='tt', - rel_paths=['tm', '.', 'set', 'dblctrl'], + sensor_path='tm', + set_path='set', ) Mod('th', diff --git a/main/ma7_sampleheat_cfg.py b/main/ma7_sampleheat_cfg.py index 21a38dd..06e7306 100644 --- a/main/ma7_sampleheat_cfg.py +++ b/main/ma7_sampleheat_cfg.py @@ -10,12 +10,13 @@ Mod('sea_main', ) Mod('tt', - 'frappy_psi.sea.SeaDrivable', '', + 'frappy_psi.sea.LscDrivable', '', io='sea_main', meaning=['temperature_regulation', 27], sea_object='tt', - rel_paths=['tm', '.', 'set', 'dblctrl'], - ) + sensor_path='tm', + set_path='set', +) Mod('th', 'frappy_psi.sea.SeaReadable', diff --git a/main/ma7_thermalc_cfg.py b/main/ma7_thermalc_cfg.py index 6fea24b..29438bf 100644 --- a/main/ma7_thermalc_cfg.py +++ b/main/ma7_thermalc_cfg.py @@ -15,11 +15,12 @@ Mod('sea_main', #) Mod('tt', - 'frappy_psi.sea.SeaDrivable', '', - meaning=['temperature_regulation', 27], + 'frappy_psi.sea.LscDrivable', '', io='sea_main', + meaning=['temperature_regulation', 27], sea_object='tt', - rel_paths=['tm', '.', 'set', 'dblctrl'], + sensor_path='tm', + set_path='set', ) Mod('th', @@ -34,8 +35,8 @@ Mod('ts', 'frappy_psi.parmod.Converging', 'test for parmod', unit='K', - value_param='th.value', - target_param='th.setsamp', + read='th.value', + write='th.setsamp', meaning=['temperature', 20], settling_time=20, tolerance=1, diff --git a/main/ma7two_cfg.py b/main/ma7two_cfg.py index ca46592..f882bd0 100644 --- a/main/ma7two_cfg.py +++ b/main/ma7two_cfg.py @@ -10,11 +10,12 @@ Mod('sea_main', ) Mod('tt', - 'frappy_psi.sea.SeaDrivable', '', + 'frappy_psi.sea.LscDrivable', '', io='sea_main', meaning=['temperature_regulation', 27], sea_object='tt', - rel_paths=['tm', '.', 'set', 'dblctrl'], + sensor_path='tm', + set_path='set', ) Mod('cc', diff --git a/main/mb11_cfg.py b/main/mb11_cfg.py index 3e30ad4..f9bde0b 100644 --- a/main/mb11_cfg.py +++ b/main/mb11_cfg.py @@ -1,102 +1,90 @@ -Node('mb11.psi.ch', - 'MB11 11 Tesla - 100 mm cryomagnet', -) +# please edit this file with frappy edit -sea_cfg = 'mb11.config' +doc="""MB11 11 Tesla - 100 mm cryomagnet -Mod('itc1', - 'frappy_psi.mercury.IO', - 'ITC for heat exchanger and pressures', - uri='mb11-ts:3001', -) +after conversion with frappy edit +""" +Node('mb11.psi.ch', doc, + interface='tcp://10767', + ) -Mod('itc2', - 'frappy_psi.mercury.IO', - 'ITC for neck and nv heaters', - uri='mb11-ts:3002', -) +IO('itc1', 'mb11-ts:3001') -Mod('ips', - 'frappy_psi.mercury.IO', - 'IPS for magnet and levels', - uri='mb11-ts:3003', -) +IO('itc2', 'mb11-ts:3002') + +IO('ips', 'mb11-ts:3003') Mod('T_stat', 'frappy_psi.mercury.TemperatureAutoFlow', 'static heat exchanger temperature', - meaning=['temperature_regulation', 27], - output_module='htr_stat', - needle_valve='p_stat', - slot='DB6.T1', - io='itc1', - tolerance=0.1, - flowpars=((1,5), (2, 20)), -) + meaning = ('temperature_regulation', 27), + output_module = 'htr_stat', + needle_valve = 'p_stat', + slot = 'DB6.T1', + io = 'itc1', + tolerance = 0.1, + flowpars = ((1, 5), (2, 20)), + ) Mod('htr_stat', 'frappy_psi.mercury.HeaterOutput', 'static heat exchanger heater', - slot='DB1.H1', - io='itc1', -) + slot = 'DB1.H1', + io = 'itc1', + ) Mod('p_stat', 'frappy_psi.mercury.PressureLoop', 'static needle valve pressure', - output_module='pos_stat', - settling_time=60.0, - slot='DB5.P1', - io='itc1', - tolerance=1.0, - value=Param( - unit='mbar_flow', - ), -) + output_module = 'pos_stat', + settling_time = 60, + slot = 'DB5.P1', + io = 'itc1', + tolerance = 1, + value = Param(unit='mbar_flow'), + ) Mod('pos_stat', 'frappy_psi.mercury.ValvePos', 'static needle valve position', - slot='DB5.P1,DB3.G1', - io='itc1', -) + slot = 'DB5.P1,DB3.G1', + io = 'itc1', + ) Mod('T_dyn', 'frappy_psi.mercury.TemperatureAutoFlow', 'dynamic heat exchanger temperature', - output_module='htr_dyn', - needle_valve='p_dyn', - slot='DB7.T1', - io='itc1', - tolerance=0.1, -) + output_module = 'htr_dyn', + needle_valve = 'p_dyn', + slot = 'DB7.T1', + io = 'itc1', + tolerance = 0.1, + ) Mod('htr_dyn', 'frappy_psi.mercury.HeaterOutput', 'dynamic heat exchanger heater', - slot='DB2.H1', - io='itc1', -) + slot = 'DB2.H1', + io = 'itc1', + ) Mod('p_dyn', 'frappy_psi.mercury.PressureLoop', 'dynamic needle valve pressure', - output_module='pos_dyn', - settling_time=60.0, - slot='DB8.P1', - io='itc1', - tolerance=1.0, - value=Param( - unit='mbar_flow', - ), -) + output_module = 'pos_dyn', + settling_time = 60, + slot = 'DB8.P1', + io = 'itc1', + tolerance = 1, + value = Param(unit='mbar_flow'), + ) Mod('pos_dyn', 'frappy_psi.mercury.ValvePos', 'dynamic needle valve position', - slot='DB8.P1,DB4.G1', - io='itc1', -) + slot = 'DB8.P1,DB4.G1', + io = 'itc1', + ) Mod('mf', 'frappy_psi.ips_mercury.Field', @@ -115,93 +103,89 @@ Mod('mf', Mod('lev', 'frappy_psi.mercury.HeLevel', 'LHe level', - slot='DB1.L1', - io='ips', -) + slot = 'DB1.L1', + io = 'ips', + ) Mod('n2lev', 'frappy_psi.mercury.N2Level', 'LN2 level', - slot='DB1.L1', - io='ips', -) + slot = 'DB1.L1', + io = 'ips', + ) Mod('T_neck1', 'frappy_psi.mercury.TemperatureLoop', 'neck heater 1 temperature', - output_module='htr_neck1', - slot='MB1.T1', - io='itc2', - tolerance=1.0, -) + output_module = 'htr_neck1', + slot = 'MB1.T1', + io = 'itc2', + tolerance = 1, + ) Mod('htr_neck1', 'frappy_psi.mercury.HeaterOutput', 'neck heater 1 power', - slot='MB0.H1', - io='itc2', -) + slot = 'MB0.H1', + io = 'itc2', + ) Mod('T_neck2', 'frappy_psi.mercury.TemperatureLoop', 'neck heater 2 temperature', - output_module='htr_neck2', - slot='DB6.T1', - io='itc2', - tolerance=1.0, -) + output_module = 'htr_neck2', + slot = 'DB6.T1', + io = 'itc2', + tolerance = 1, + ) Mod('htr_neck2', 'frappy_psi.mercury.HeaterOutput', 'neck heater 2 power', - slot='DB1.H1', - io='itc2', -) + slot = 'DB1.H1', + io = 'itc2', + ) Mod('T_nvs', 'frappy_psi.mercury.TemperatureLoop', 'static needle valve temperature', - output_module='htr_nvs', - slot='DB7.T1', - io='itc2', - tolerance=0.1, -) + output_module = 'htr_nvs', + slot = 'DB7.T1', + io = 'itc2', + tolerance = 0.1, + ) Mod('htr_nvs', 'frappy_psi.mercury.HeaterOutput', 'static needle valve heater power', - slot='DB2.H1', - io='itc2', -) + slot = 'DB2.H1', + io = 'itc2', + ) Mod('T_nvd', 'frappy_psi.mercury.TemperatureLoop', 'dynamic needle valve heater temperature', - output_module='htr_nvd', - slot='DB8.T1', - io='itc2', - tolerance=0.1, -) + output_module = 'htr_nvd', + slot = 'DB8.T1', + io = 'itc2', + tolerance = 0.1, + ) Mod('htr_nvd', 'frappy_psi.mercury.HeaterOutput', 'dynamic needle valve heater power', - slot='DB3.H1', - io='itc2', -) + slot = 'DB3.H1', + io = 'itc2', + ) Mod('T_coil', 'frappy_psi.mercury.TemperatureSensor', 'coil temperature', - slot='MB1.T1', - io='ips', -) + slot = 'MB1.T1', + io = 'ips', + ) -Mod('om_io', - 'frappy_psi.phytron.PhytronIO', - 'dom motor IO', - uri='mb11-ts.psi.ch:3004', -) +IO('om_io', 'mb11-ts.psi.ch:3004') Mod('om', 'frappy_psi.phytron.Motor', @@ -213,3 +197,4 @@ Mod('om', target=Param(min=-360, max=360), meaning=['rotation_z', 30], ) + diff --git a/stick/ma7stick_cfg.py b/stick/ma7stick_cfg.py index 7c602a0..1ed739e 100644 --- a/stick/ma7stick_cfg.py +++ b/stick/ma7stick_cfg.py @@ -9,10 +9,23 @@ Mod('sea_stick', service='stick', ) -Mod('ts', - 'frappy_psi.sea.SeaReadable', '', - meaning=['temperature', 30], +Mod('ts_sea', + 'frappy_psi.sea.SeaReadable', + 'readable sample stick T', io='sea_stick', - sea_path='tt/ts', json_file='ma7.config.json', + sea_object='tt', + rel_paths=['ts', 'setsamp'], ) + +Mod('ts', + 'frappy_psi.parmod.Converging', + 'drivable stick T using setsamp', + unit='K', + read='ts_sea.value', + write='ts_sea.setsamp', + meaning=['temperature', 20], + settling_time=20, + tolerance=1, +) + diff --git a/stick/mb11stick_cfg.py b/stick/mb11stick_cfg.py index deb794c..66c31da 100644 --- a/stick/mb11stick_cfg.py +++ b/stick/mb11stick_cfg.py @@ -1,3 +1,33 @@ +import os + Node('mb11stick.psi.ch', 'MB11 standard sample stick (do not use)', ) + +frappy_main_port = os.environ.get('FRAPPY_MAIN_PORT', 0) + +Mod('itc1_', + 'frappy.core.Proxy', + 'itc1 on main frappy server', + remote_class = 'frappy_psi.mercury.IO', + uri = f'tcp://localhost:{frappy_main_port}', + module='itc1', + # export = False, +) + + +Mod('T_sample', + 'frappy_psi.mercury.TemperatureLoop', + 'T at sample stick sensor', + meaning=['temperature', 30], + io='itc1_', + slot='MB1.T1', +) + +Mod('htr_sample', + 'frappy_psi.mercury.HeaterOutput', + 'sample stick heater power', + slot='MB0.H1', + io='itc1_', +) +