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

2023-07-03 17:51:43 +02:00
parent 3e4ea2515e 714c820115
commit 19f965bced
19 changed files with 290 additions and 140 deletions
--- a/cfg/stick/dil5_cfg.py
+++ b/cfg/stick/dil5_cfg.py
@ -7,7 +7,7 @@ Mod('triton',
    'frappy_psi.mercury.IO',
    'connection to triton software',
    uri='tcp://linse-dil5:33576',
-    timeout=5.0,
+    timeout=25.0,
 )

 Mod('ts',
@ -23,6 +23,7 @@ Mod('htr_mix',
    'mix. chamber heater',
    slot='H1,T5',
    io='triton',
+    resistivity = 100
 )

 Mod('htr_sorb',