Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip

This commit is contained in:
2023-08-10 14:35:03 +02:00
27 changed files with 195 additions and 132 deletions

View File

@ -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',
)

View File

@ -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',
)

View File

@ -1,6 +1,5 @@
Node('cyrosim.psi.ch',
'cryo simulation (similar ppms simulation)',
interface='tcp://5000',
)
Mod('tt',

View File

@ -12,7 +12,7 @@ Mod('th',
meaning = ('temperature', 10),
io = 'sea_main',
sea_object = 'th',
extra_modules='t2',
extra_modules=['t2'],
)
Mod('ts',
'frappy_psi.sea.SeaReadable', '',

View File

@ -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',
)

View File

@ -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',

View File

@ -1,6 +1,5 @@
Node('magsim.psi.ch',
'cryo magnet simulation (similar to ppms simulation)',
interface='tcp://5000',
)
Mod('tt',

View File

@ -1,6 +1,5 @@
Node('mb11.psi.ch',
'MB11 11 Tesla - 100 mm cryomagnet',
interface='tcp://5000',
)
Mod('itc1',

View File

@ -1,6 +1,5 @@
Node('mb11.psi.ch',
'MB11 11 Tesla - 100 mm cryomagnet',
interface='tcp://5000',
)
Mod('itc1',

View File

@ -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',
)