From c40033a816d3989f1c92bc45b0e8ec64b9d38b66 Mon Sep 17 00:00:00 2001 From: Markus Zolliker Date: Wed, 9 Aug 2023 17:36:02 +0200 Subject: [PATCH] update old cfg files - change secop_psi to frappy_psi - remove interface and name in Node Change-Id: I69242de250c9ecf52e001fce6396347dbf3fedcb --- cfg/addons/camea-be-filter_cfg.py | 6 ++---- cfg/main/ccrpe_cfg.py | 12 +++++------ cfg/main/ccrpe_lowT_cfg.py | 12 +++++------ cfg/main/cryosim_cfg.py | 1 - cfg/main/ill3_cfg.py | 24 ++++++++++------------ cfg/main/ma7two_cfg.py | 34 +++++++++++++++---------------- cfg/main/magsim_cfg.py | 1 - cfg/main/mb11_cfg.py | 1 - cfg/main/mb11std_cfg.py | 1 - cfg/main/rt_cfg.py | 6 ++---- cfg/stick/dil5_cfg.py | 1 - cfg/stick/flamedil_cfg.py | 1 - cfg/stick/hvolt_long_cfg.py | 8 +++----- cfg/stick/ill3stick_cfg.py | 6 ++---- cfg/stick/mb11stick_cfg.py | 1 - cfg/stick/ori1stick_cfg.py | 6 ++---- cfg/stick/ovenstick_cfg.py | 6 ++---- cfg/stick/oventwo_cfg.py | 6 ++---- cfg/stick/sch_cfg.py | 8 +++----- cfg/stick/varioxstick_cfg.py | 6 ++---- 20 files changed, 57 insertions(+), 90 deletions(-) diff --git a/cfg/addons/camea-be-filter_cfg.py b/cfg/addons/camea-be-filter_cfg.py index 84f491c..61a331f 100644 --- a/cfg/addons/camea-be-filter_cfg.py +++ b/cfg/addons/camea-be-filter_cfg.py @@ -1,18 +1,16 @@ Node('cfg/sea/camea-be-filter.cfg', 'Camea Be-Filter', - interface='5000', - name='camea-be-filter', ) Mod('sea_addons', - 'secop_psi.sea.SeaClient', + 'frappy_psi.sea.SeaClient', 'addons sea connection for camea-be-filter.addon', config='camea-be-filter.addon', service='addons', ) Mod('t_be_filter', - 'secop_psi.sea.SeaReadable', + 'frappy_psi.sea.SeaReadable', io='sea_addons', sea_object='t_be_filter', ) diff --git a/cfg/main/ccrpe_cfg.py b/cfg/main/ccrpe_cfg.py index 3e6c1ac..0fb6171 100644 --- a/cfg/main/ccrpe_cfg.py +++ b/cfg/main/ccrpe_cfg.py @@ -1,39 +1,37 @@ Node('cfg/main/ccrpe.cfg', '4 K closed cycle cryostat (PE cell)', - interface='5000', - name='ccrpe', ) Mod('sea_main', - 'secop_psi.sea.SeaClient', + 'frappy_psi.sea.SeaClient', 'main sea connection for ccrpe.config', config='ccrpe.config', service='main', ) Mod('tt', - 'secop_psi.sea.SeaDrivable', '', + 'frappy_psi.sea.SeaDrivable', '', io='sea_main', sea_object='tt', rel_paths=['.', 'tm'], ) Mod('ts', - 'secop_psi.sea.SeaReadable', '', + 'frappy_psi.sea.SeaReadable', '', io='sea_main', sea_object='tt', rel_paths=['ts'], ) Mod('te', - 'secop_psi.sea.SeaReadable', '', + 'frappy_psi.sea.SeaReadable', '', io='sea_main', sea_object='tt', rel_paths=['te'], ) Mod('warmup', - 'secop_psi.sea.SeaDrivable', '', + 'frappy_psi.sea.SeaDrivable', '', io='sea_main', sea_object='warmup', ) diff --git a/cfg/main/ccrpe_lowT_cfg.py b/cfg/main/ccrpe_lowT_cfg.py index ba077e8..0a87187 100644 --- a/cfg/main/ccrpe_lowT_cfg.py +++ b/cfg/main/ccrpe_lowT_cfg.py @@ -1,39 +1,37 @@ Node('cfg/main/ccrpe_lowT.cfg', '4 K closed cycle cryostat (PE cell)', - interface='5000', - name='ccrpe_lowT', ) Mod('sea_main', - 'secop_psi.sea.SeaClient', + 'frappy_psi.sea.SeaClient', 'main sea connection for ccrpe_lowT.config', config='ccrpe_lowT.config', service='main', ) Mod('tt', - 'secop_psi.sea.SeaDrivable', '', + 'frappy_psi.sea.SeaDrivable', '', io='sea_main', sea_object='tt', rel_paths=['.', 'tm'], ) Mod('ts', - 'secop_psi.sea.SeaReadable', '', + 'frappy_psi.sea.SeaReadable', '', io='sea_main', sea_object='tt', rel_paths=['ts'], ) Mod('te', - 'secop_psi.sea.SeaReadable', '', + 'frappy_psi.sea.SeaReadable', '', io='sea_main', sea_object='tt', rel_paths=['te'], ) Mod('warmup', - 'secop_psi.sea.SeaDrivable', '', + 'frappy_psi.sea.SeaDrivable', '', io='sea_main', sea_object='warmup', ) diff --git a/cfg/main/cryosim_cfg.py b/cfg/main/cryosim_cfg.py index 9dfe9ff..9b5f6c0 100644 --- a/cfg/main/cryosim_cfg.py +++ b/cfg/main/cryosim_cfg.py @@ -1,6 +1,5 @@ Node('cyrosim.psi.ch', 'cryo simulation (similar ppms simulation)', - interface='tcp://5000', ) Mod('tt', diff --git a/cfg/main/ill3_cfg.py b/cfg/main/ill3_cfg.py index 4bb9216..2b29519 100644 --- a/cfg/main/ill3_cfg.py +++ b/cfg/main/ill3_cfg.py @@ -1,24 +1,22 @@ Node('cfg/main/ill3.cfg', 'orange cryofurnace with 70 mm sample space (low T)', - interface='5000', - name='ill3', ) Mod('sea_main', - 'secop_psi.sea.SeaClient', + 'frappy_psi.sea.SeaClient', 'main sea connection for ill3.config', config='ill3.config', service='main', ) Mod('tt', - 'secop_psi.sea.SeaDrivable', '', + 'frappy_psi.sea.SeaDrivable', '', io='sea_main', sea_object='tt', ) Mod('cc', - 'secop_psi.sea.SeaReadable', '', + 'frappy_psi.sea.SeaReadable', '', io='sea_main', sea_object='cc', extra_modules=['h'], @@ -26,49 +24,49 @@ Mod('cc', ) Mod('lev', - 'secop_psi.sea.SeaReadable', '', + 'frappy_psi.sea.SeaReadable', '', io='sea_main', single_module='cc.h', ) Mod('nv', - 'secop_psi.sea.SeaWritable', '', + 'frappy_psi.sea.SeaWritable', '', io='sea_main', sea_object='nv', ) Mod('ln2fill', - 'secop_psi.sea.SeaWritable', '', + 'frappy_psi.sea.SeaWritable', '', io='sea_main', sea_object='ln2fill', ) Mod('hefill', - 'secop_psi.sea.SeaWritable', '', + 'frappy_psi.sea.SeaWritable', '', io='sea_main', sea_object='hefill', ) Mod('hepump', - 'secop_psi.sea.SeaWritable', '', + 'frappy_psi.sea.SeaWritable', '', io='sea_main', sea_object='hepump', ) Mod('hemot', - 'secop_psi.sea.SeaDrivable', '', + 'frappy_psi.sea.SeaDrivable', '', io='sea_main', sea_object='hemot', ) Mod('nvflow', - 'secop_psi.sea.SeaReadable', '', + 'frappy_psi.sea.SeaReadable', '', io='sea_main', sea_object='nvflow', ) Mod('table', - 'secop_psi.sea.SeaReadable', '', + 'frappy_psi.sea.SeaReadable', '', io='sea_main', sea_object='table', ) diff --git a/cfg/main/ma7two_cfg.py b/cfg/main/ma7two_cfg.py index fd5eaf2..a475664 100644 --- a/cfg/main/ma7two_cfg.py +++ b/cfg/main/ma7two_cfg.py @@ -1,104 +1,102 @@ Node('cfg/main/ma7two.cfg', '6.8 Tesla horizontal cryomagnet with two heater loops', - interface='5000', - name='ma7two', ) Mod('sea_main', - 'secop_psi.sea.SeaClient', + 'frappy_psi.sea.SeaClient', 'main sea connection for ma7two.config', config='ma7two.config', service='main', ) Mod('tt', - 'secop_psi.sea.SeaDrivable', '', + 'frappy_psi.sea.SeaDrivable', '', io='sea_main', sea_object='tt', ) Mod('cc', - 'secop_psi.sea.SeaReadable', '', + 'frappy_psi.sea.SeaReadable', '', io='sea_main', sea_object='cc', ) Mod('nv', - 'secop_psi.sea.SeaWritable', '', + 'frappy_psi.sea.SeaWritable', '', io='sea_main', sea_object='nv', ) Mod('hefill', - 'secop_psi.sea.SeaWritable', '', + 'frappy_psi.sea.SeaWritable', '', io='sea_main', sea_object='hefill', ) Mod('hepump', - 'secop_psi.sea.SeaWritable', '', + 'frappy_psi.sea.SeaWritable', '', io='sea_main', sea_object='hepump', ) Mod('hemot', - 'secop_psi.sea.SeaDrivable', '', + 'frappy_psi.sea.SeaDrivable', '', io='sea_main', sea_object='hemot', ) Mod('nvflow', - 'secop_psi.sea.SeaReadable', '', + 'frappy_psi.sea.SeaReadable', '', io='sea_main', sea_object='nvflow', ) Mod('ln2fill', - 'secop_psi.sea.SeaWritable', '', + 'frappy_psi.sea.SeaWritable', '', io='sea_main', sea_object='ln2fill', ) Mod('mf', - 'secop_psi.sea.SeaReadable', '', + 'frappy_psi.sea.SeaReadable', '', io='sea_main', sea_object='mf', ) Mod('lev', - 'secop_psi.sea.SeaReadable', '', + 'frappy_psi.sea.SeaReadable', '', io='sea_main', sea_object='lev', ) Mod('tcoil1', - 'secop_psi.sea.SeaReadable', '', + 'frappy_psi.sea.SeaReadable', '', io='sea_main', sea_object='tcoil', rel_paths=['ta'], ) Mod('tcoil2', - 'secop_psi.sea.SeaReadable', '', + 'frappy_psi.sea.SeaReadable', '', io='sea_main', sea_object='tcoil', rel_paths=['tb'], ) Mod('table', - 'secop_psi.sea.SeaReadable', '', + 'frappy_psi.sea.SeaReadable', '', io='sea_main', sea_object='table', ) Mod('om_io', - 'secop_psi.phytron.PhytronIO', + 'frappy_psi.phytron.PhytronIO', 'dom motor IO', uri='ma7-ts.psi.ch:3007', ) Mod('om', - 'secop_psi.phytron.Motor', + 'frappy_psi.phytron.Motor', 'stick rotation', io='om_io', encoder_mode='CHECK', diff --git a/cfg/main/magsim_cfg.py b/cfg/main/magsim_cfg.py index 3f9f4d6..f346edc 100644 --- a/cfg/main/magsim_cfg.py +++ b/cfg/main/magsim_cfg.py @@ -1,6 +1,5 @@ Node('magsim.psi.ch', 'cryo magnet simulation (similar to ppms simulation)', - interface='tcp://5000', ) Mod('tt', diff --git a/cfg/main/mb11_cfg.py b/cfg/main/mb11_cfg.py index a7de8ca..9821051 100644 --- a/cfg/main/mb11_cfg.py +++ b/cfg/main/mb11_cfg.py @@ -1,6 +1,5 @@ Node('mb11.psi.ch', 'MB11 11 Tesla - 100 mm cryomagnet', - interface='tcp://5000', ) Mod('itc1', diff --git a/cfg/main/mb11std_cfg.py b/cfg/main/mb11std_cfg.py index b58b512..7ae3e8e 100644 --- a/cfg/main/mb11std_cfg.py +++ b/cfg/main/mb11std_cfg.py @@ -1,6 +1,5 @@ Node('mb11.psi.ch', 'MB11 11 Tesla - 100 mm cryomagnet', - interface='tcp://5000', ) Mod('itc1', diff --git a/cfg/main/rt_cfg.py b/cfg/main/rt_cfg.py index 3d2f750..6eda872 100644 --- a/cfg/main/rt_cfg.py +++ b/cfg/main/rt_cfg.py @@ -1,18 +1,16 @@ Node('cfg/main/rt.cfg', 'room temperature HRPT (pt1000)', - interface='5000', - name='rt', ) Mod('sea_main', - 'secop_psi.sea.SeaClient', + 'frappy_psi.sea.SeaClient', 'main sea connection for rt.config', config='rt.config', service='main', ) Mod('tt', - 'secop_psi.sea.SeaDrivable', '', + 'frappy_psi.sea.SeaDrivable', '', sea_object='tt', io='sea_main', ) diff --git a/cfg/stick/dil5_cfg.py b/cfg/stick/dil5_cfg.py index a31867b..8081928 100644 --- a/cfg/stick/dil5_cfg.py +++ b/cfg/stick/dil5_cfg.py @@ -1,6 +1,5 @@ Node('triton.psi.ch', 'triton test', - interface='tcp://5000', ) Mod('triton', diff --git a/cfg/stick/flamedil_cfg.py b/cfg/stick/flamedil_cfg.py index 2bc36f4..551982a 100644 --- a/cfg/stick/flamedil_cfg.py +++ b/cfg/stick/flamedil_cfg.py @@ -1,6 +1,5 @@ Node('triton.psi.ch', 'triton test', - interface='tcp://5000', ) Mod('T_mix', diff --git a/cfg/stick/hvolt_long_cfg.py b/cfg/stick/hvolt_long_cfg.py index 8801ce4..69c63eb 100644 --- a/cfg/stick/hvolt_long_cfg.py +++ b/cfg/stick/hvolt_long_cfg.py @@ -1,18 +1,16 @@ Node('cfg/stick/hvolt_long.cfg', 'high voltage stick (extended can)', - interface='5000', - name='hvolt_long', ) Mod('sea_stick', - 'secop_psi.sea.SeaClient', + 'frappy_psi.sea.SeaClient', 'stick sea connection for hvolt_long.stick', config='hvolt_long.stick', service='stick', ) Mod('ts', - 'secop_psi.sea.SeaReadable', '', + 'frappy_psi.sea.SeaReadable', '', io='sea_stick', sea_object='tt', json_file='ma6.config.json', @@ -20,7 +18,7 @@ Mod('ts', ) Mod('hcp', - 'secop_psi.sea.SeaReadable', '', + 'frappy_psi.sea.SeaReadable', '', io='sea_stick', sea_object='hcp', ) diff --git a/cfg/stick/ill3stick_cfg.py b/cfg/stick/ill3stick_cfg.py index 3a69ce7..18e3c8a 100644 --- a/cfg/stick/ill3stick_cfg.py +++ b/cfg/stick/ill3stick_cfg.py @@ -1,18 +1,16 @@ Node('cfg/stick/ill3stick.cfg', 'ILL3 standard sample stick', - interface='5000', - name='ill3stick', ) Mod('sea_stick', - 'secop_psi.sea.SeaClient', + 'frappy_psi.sea.SeaClient', 'SEA stick connection', config='ill3.stick', service='stick', ) Mod('ts', - 'secop_psi.sea.SeaReadable', '', + 'frappy_psi.sea.SeaReadable', '', io='sea_stick', sea_object='tt', json_file='ill3.config.json', diff --git a/cfg/stick/mb11stick_cfg.py b/cfg/stick/mb11stick_cfg.py index 06dc82e..02d8071 100644 --- a/cfg/stick/mb11stick_cfg.py +++ b/cfg/stick/mb11stick_cfg.py @@ -1,4 +1,3 @@ Node('mb11.stick.sea.psi.ch', 'MB11 standard sample stick (do not use)', - interface='tcp://5000', ) diff --git a/cfg/stick/ori1stick_cfg.py b/cfg/stick/ori1stick_cfg.py index a3c1a57..aaa5286 100644 --- a/cfg/stick/ori1stick_cfg.py +++ b/cfg/stick/ori1stick_cfg.py @@ -1,18 +1,16 @@ Node('cfg/stick/ori1stick.cfg', 'ORI1 standard sample stick', - interface='5000', - name='ori1stick', ) Mod('sea_stick', - 'secop_psi.sea.SeaClient', + 'frappy_psi.sea.SeaClient', 'SEA stick connection', config='ori1.stick', service='stick', ) Mod('ts', - 'secop_psi.sea.SeaReadable', '', + 'frappy_psi.sea.SeaReadable', '', io='sea_stick', sea_object='tt', json_file='ill1.config.json', diff --git a/cfg/stick/ovenstick_cfg.py b/cfg/stick/ovenstick_cfg.py index d76954b..ad5a46d 100644 --- a/cfg/stick/ovenstick_cfg.py +++ b/cfg/stick/ovenstick_cfg.py @@ -1,18 +1,16 @@ Node('cfg/stick/ovenstick.cfg', 'oven stick for sans', - interface='5000', - name='ovenstick', ) Mod('sea_stick', - 'secop_psi.sea.SeaClient', + 'frappy_psi.sea.SeaClient', 'SEA stick connection', config='oven.stick', service='stick', ) Mod('ts', - 'secop_psi.sea.SeaReadable', '', + 'frappy_psi.sea.SeaReadable', '', io='sea_stick', sea_object='tt', json_file='ma7.config.json', diff --git a/cfg/stick/oventwo_cfg.py b/cfg/stick/oventwo_cfg.py index 1e9cab5..2708d1d 100644 --- a/cfg/stick/oventwo_cfg.py +++ b/cfg/stick/oventwo_cfg.py @@ -1,18 +1,16 @@ Node('cfg/stick/oventwo.cfg', 'oven stick for SANS', - interface='5000', - name='oventwo', ) Mod('sea_stick', - 'secop_psi.sea.SeaClient', + 'frappy_psi.sea.SeaClient', 'stick sea connection for oventwo.stick', config='oventwo.stick', service='stick', ) Mod('ts', - 'secop_psi.sea.SeaDrivable', '', + 'frappy_psi.sea.SeaDrivable', '', io='sea_stick', sea_object='ts', ) diff --git a/cfg/stick/sch_cfg.py b/cfg/stick/sch_cfg.py index 027d85b..e3d336d 100644 --- a/cfg/stick/sch_cfg.py +++ b/cfg/stick/sch_cfg.py @@ -1,25 +1,23 @@ # error creating warmup Node('cfg/stick/sch.cfg', 'old sample changer for 100 mm orange cryo (4 samples, HRPT)', - interface='5000', - name='sch', ) Mod('sea_stick', - 'secop_psi.sea.SeaClient', + 'frappy_psi.sea.SeaClient', 'SEA connection to sch4', config='sch.stick', service='stick', ) Mod('warmup', - 'secop_psi.sea.SeaReadable', '', + 'frappy_psi.sea.SeaReadable', '', sea_object='warmup', io='sea_stick', ) Mod('ts', - 'secop_psi.sea.SeaReadable', '', + 'frappy_psi.sea.SeaReadable', '', sea_object='tt', json_file='ori4.config.json', rel_paths=['ts'], diff --git a/cfg/stick/varioxstick_cfg.py b/cfg/stick/varioxstick_cfg.py index c653d0b..7ec1ce8 100644 --- a/cfg/stick/varioxstick_cfg.py +++ b/cfg/stick/varioxstick_cfg.py @@ -1,18 +1,16 @@ Node('cfg/stick/varioxstick.cfg', 'Variox standard sample stick', - interface='5000', - name='varioxstick', ) Mod('sea_stick', - 'secop_psi.sea.SeaClient', + 'frappy_psi.sea.SeaClient', 'SEA stick connection', config='variox.stick', service='stick', ) Mod('ts', - 'secop_psi.sea.SeaReadable', '', + 'frappy_psi.sea.SeaReadable', '', io='sea_stick', sea_object='tt', json_file='variox.config.json',