diff --git a/main/jt_cfg.py b/main/jt_cfg.py deleted file mode 100644 index bb0f281..0000000 --- a/main/jt_cfg.py +++ /dev/null @@ -1,65 +0,0 @@ -Node('jtccr.psi.ch', - 'CCR with JT-stage', - secondary = ['ws://8051'], -) - -Mod('jtcontrol', - 'frappy_psi.jtccr.JTCCR', - 'jt ccr control', - compressor = 'jtcompressor', - ccrcompressor = 'ccrcompressor', -) - -IO('io_p1', 'jtccr-ts:3001', visibility='expert') -IO('io_p2', 'jtccr-ts:3002', visibility='expert') -IO('io_p3', 'jtccr-ts:3003', visibility='expert') -IO('io_p4', 'jtccr-ts:3004', visibility='expert') -IO('io_preg', 'jtccr-ts:3005', visibility='expert') -IO('io_ccu', 'jtccr-ts:3006', visibility='expert') -IO('io_pwsw', 'jtccr-ts:3007', visibility='expert') -IO('io_lsc', 'jtccr-ls:7777', visibility='expert') - -Mod('ls', 'frappy_psi.lakeshore336.Device', - 'lakeshore in cc rack', curve_handling=True, io='io_lsc', visibility='expert') - -Mod('T_main', 'frappy_psi.lakeshore336.Sensor', 'T sensor Ts', - channel='A', calcurve='x63710', device='ls', io='io_lsc', - meaning = ['temperature', 20],) - -Mod('T_ccr', 'frappy_psi.lakeshore336.Loop', 'T loop T', - channel='B', calcurve='x67737', output_module='htr', device='ls', io='io_lsc') - -Mod('htr', 'frappy_psi.lakeshore336.MainOutput', 'heater output', - io='io_lsc', visibility='expert') - -for i in range(1,11): - Mod(f'v{i}', 'frappy_psi.ccu4.Valve', f'valve V{i}', io='io_ccu', - channel=i, visibility='expert') - -#Mod('vm', -# 'frappy_psi.ccu4.MotorValve', 'motor valve VM', -# io='io_ccu', -#) - -Mod('pressreg', - 'frappy_psi.bronkhorst.Controller', 'pressure regulator', - io='io_preg', - value = Param(unit='mbar'), - scale = 18, -) - -for i in range(1,5): - Mod(f'p{i}', 'frappy_psi.dtmpressure.Pressure', '', io=f'io_p{i}') - -Mod('jtcompressor', 'frappy_psi.epc8210.Switch', 'jt compressor switch', io='io_pwsw', - addr=1, visibility='expert') -Mod('jtpump', 'frappy_psi.epc8210.Switch', 'jt pump switch', io='io_pwsw', - addr=2, visibility='expert') -Mod('ccrcompressor', 'frappy_psi.epc8210.Switch', 'ccr compressor switch', io='io_pwsw', - addr=3, visibility='expert') -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/jtccr_cfg.py b/main/jtccr_cfg.py index 43079da..0d89e63 100644 --- a/main/jtccr_cfg.py +++ b/main/jtccr_cfg.py @@ -1,134 +1,83 @@ -Node('jtccr.config.sea.psi.ch', +Node('jtccr.psi.ch', 'CCR with JT-stage', + secondary = ['ws://8051'], ) -Mod('sea_main', - 'frappy_psi.sea.SeaClient', - 'main sea connection for jtccr.config', - config='jtccr.config', - service='main', +sea_cfg = 'secop.config' + +IO('io_p1', 'jtccr-ts:3001', visibility='expert') +IO('io_p2', 'jtccr-ts:3002', visibility='expert') +IO('io_p3', 'jtccr-ts:3003', visibility='expert') +IO('io_p4', 'jtccr-ts:3004', visibility='expert') +IO('io_preg', 'jtccr-ts:3005', visibility='expert') +IO('io_ccu', 'jtccr-ts:3006', visibility='expert') +IO('io_pwsw', 'jtccr-ts:3007', visibility='expert') +IO('io_lsc', 'jtccr-ls:7777', visibility='expert') + +Mod('ls', 'frappy_psi.lakeshore336.Device', + 'lakeshore in cc rack', curve_handling=True, io='io_lsc', visibility='expert') + +Mod('T_main', 'frappy_psi.lakeshore336.Loop', 'T sensor Ts', + channel='A', calcurve='X63710', device='ls', io='io_lsc', output_module='htr', + meaning = ['temperature', 20],) + +Mod('T_ccr', 'frappy_psi.lakeshore336.Sensor', 'T of cold finger', + channel='B', calcurve='X67737', device='ls', io='io_lsc') + +Mod('htr', 'frappy_psi.lakeshore336.MainOutput', 'heater output', + io='io_lsc', max_heater='5W', visibility='expert', resistance=100) # in fact 500, but with parallel R about 100 + +Mod('jtcontrol', + 'frappy_psi.jtccr.JTCCR', + 'jt ccr control', + compressor = 'jtcompressor', + ccrcompressor = 'ccrcompressor', + preg = 'preg', + ccr_temp = 'T_main', ) -Mod('tt', - 'frappy_psi.sea.SeaDrivable', '', - io='sea_main', - meaning=['temperature_regulation', 27], - sea_object='tt', - rel_paths=['tt', 'set'], +for i in range(1,11): + Mod(f'v{i}', 'frappy_psi.ccu4.Valve', f'valve V{i}', io='io_ccu', + channel=i, visibility='expert') + +Mod('MV9', + 'frappy_psi.manual_valves.ManualValve', + 'Manual Valve MV9', + visibility='expert', ) -Mod('T_ccr', - 'frappy_psi.sea.SeaReadable', '', - io='sea_main', - sea_object='tt', - rel_paths=['ccr'], +Mod('MV1', + 'frappy_psi.manual_valves.ManualValve', + 'Manual Valve MV1', + visibility='expert', +) + +#Mod('vm', +# 'frappy_psi.ccu4.MotorValve', 'motor valve VM', +# io='io_ccu', +#) + +Mod('preg', + 'frappy_psi.bronkhorst.Controller', 'pressure regulator', + io='io_preg', + value = Param(unit='bar'), + scale = 18, ) -Mod('jtccr', - 'frappy_psi.sea.SeaWritable', '', - io='sea_main', - sea_object='jtccr', - extra_modules=['v1','v2','v3','v4','v5','v6','v7','v8','v9','v10','vm'], -) +punit = 'mbar' +for i in range(1,5): + Mod(f'p{i}', 'frappy_psi.dtmpressure.Pressure', '', io=f'io_p{i}', value = Param(unit=punit)) + punit = 'bar' -Mod('v1', - 'frappy_psi.sea.SeaWritable', '', - io='sea_main', - single_module='jtccr.v1', -) +Mod('jtcompressor', 'frappy_psi.epc8210.Switch', 'jt compressor switch', io='io_pwsw', + addr=1, visibility='expert') +Mod('jtpump', 'frappy_psi.epc8210.Switch', 'jt pump switch', io='io_pwsw', + addr=2, visibility='expert') +Mod('ccrcompressor', 'frappy_psi.epc8210.Switch', 'ccr compressor switch', io='io_pwsw', + addr=3, visibility='expert') +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') -Mod('v2', - 'frappy_psi.sea.SeaWritable', '', - io='sea_main', - single_module='jtccr.v2', -) -Mod('v3', - 'frappy_psi.sea.SeaWritable', '', - io='sea_main', - single_module='jtccr.v3', -) - -Mod('v4', - 'frappy_psi.sea.SeaWritable', '', - io='sea_main', - single_module='jtccr.v4', -) - -Mod('v5', - 'frappy_psi.sea.SeaWritable', '', - io='sea_main', - single_module='jtccr.v5', -) - -Mod('v6', - 'frappy_psi.sea.SeaWritable', '', - io='sea_main', - single_module='jtccr.v6', -) - -Mod('v7', - 'frappy_psi.sea.SeaWritable', '', - io='sea_main', - single_module='jtccr.v7', -) - -Mod('v8', - 'frappy_psi.sea.SeaWritable', '', - io='sea_main', - single_module='jtccr.v8', -) - -Mod('v9', - 'frappy_psi.sea.SeaWritable', '', - io='sea_main', - single_module='jtccr.v9', -) - -Mod('v10', - 'frappy_psi.sea.SeaWritable', '', - io='sea_main', - single_module='jtccr.v10', -) - -Mod('vm', - 'frappy_psi.sea.SeaWritable', '', - io='sea_main', - single_module='jtccr.vm', -) - -Mod('p1', - 'frappy_psi.sea.SeaReadable', '', - io='sea_main', - sea_object='p1', -) - -Mod('p2', - 'frappy_psi.sea.SeaReadable', '', - io='sea_main', - sea_object='p2', -) - -Mod('p3', - 'frappy_psi.sea.SeaReadable', '', - io='sea_main', - sea_object='p3', -) - -Mod('p4', - 'frappy_psi.sea.SeaReadable', '', - io='sea_main', - sea_object='p4', -) - -Mod('pressreg', - 'frappy_psi.sea.SeaReadable', '', - io='sea_main', - sea_object='pressreg', -) - -Mod('epc', - 'frappy_psi.sea.SeaReadable', '', - io='sea_main', - sea_object='epc', -) diff --git a/main/jtccr_sea_cfg.py b/main/jtccr_sea_cfg.py new file mode 100644 index 0000000..f986f48 --- /dev/null +++ b/main/jtccr_sea_cfg.py @@ -0,0 +1,134 @@ +Node('jtccr_sea.psi.ch', + 'CCR with JT-stage', +) + +Mod('sea_main', + 'frappy_psi.sea.SeaClient', + 'main sea connection for jtccr.config', + config='jtccr.config', + service='main', +) + +Mod('tt', + 'frappy_psi.sea.SeaDrivable', '', + io='sea_main', + meaning=['temperature_regulation', 27], + sea_object='tt', + rel_paths=['tt', 'set'], +) + +Mod('T_ccr', + 'frappy_psi.sea.SeaReadable', '', + io='sea_main', + sea_object='tt', + rel_paths=['ccr'], +) + +Mod('jtccr', + 'frappy_psi.sea.SeaWritable', '', + io='sea_main', + sea_object='jtccr', + extra_modules=['v1','v2','v3','v4','v5','v6','v7','v8','v9','v10','vm'], +) + +Mod('v1', + 'frappy_psi.sea.SeaWritable', '', + io='sea_main', + single_module='jtccr.v1', +) + +Mod('v2', + 'frappy_psi.sea.SeaWritable', '', + io='sea_main', + single_module='jtccr.v2', +) + +Mod('v3', + 'frappy_psi.sea.SeaWritable', '', + io='sea_main', + single_module='jtccr.v3', +) + +Mod('v4', + 'frappy_psi.sea.SeaWritable', '', + io='sea_main', + single_module='jtccr.v4', +) + +Mod('v5', + 'frappy_psi.sea.SeaWritable', '', + io='sea_main', + single_module='jtccr.v5', +) + +Mod('v6', + 'frappy_psi.sea.SeaWritable', '', + io='sea_main', + single_module='jtccr.v6', +) + +Mod('v7', + 'frappy_psi.sea.SeaWritable', '', + io='sea_main', + single_module='jtccr.v7', +) + +Mod('v8', + 'frappy_psi.sea.SeaWritable', '', + io='sea_main', + single_module='jtccr.v8', +) + +Mod('v9', + 'frappy_psi.sea.SeaWritable', '', + io='sea_main', + single_module='jtccr.v9', +) + +Mod('v10', + 'frappy_psi.sea.SeaWritable', '', + io='sea_main', + single_module='jtccr.v10', +) + +Mod('vm', + 'frappy_psi.sea.SeaWritable', '', + io='sea_main', + single_module='jtccr.vm', +) + +Mod('p1', + 'frappy_psi.sea.SeaReadable', '', + io='sea_main', + sea_object='p1', +) + +Mod('p2', + 'frappy_psi.sea.SeaReadable', '', + io='sea_main', + sea_object='p2', +) + +Mod('p3', + 'frappy_psi.sea.SeaReadable', '', + io='sea_main', + sea_object='p3', +) + +Mod('p4', + 'frappy_psi.sea.SeaReadable', '', + io='sea_main', + sea_object='p4', +) + +Mod('pressreg', + 'frappy_psi.sea.SeaReadable', '', + io='sea_main', + sea_object='pressreg', +) + +Mod('epc', + 'frappy_psi.sea.SeaReadable', '', + io='sea_main', + sea_object='epc', +)