core: fix Dispatcher and SECNode opts handling

both tried to consume everything before, also making the check for
unknown options afterwards pointless

Change-Id: I7e44c088163e0b99ac509a2c0f757270807d97ab
Fixes: #4912
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34837
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>

.pylintrc

@@ -40,6 +40,7 @@ disable=missing-docstring
         ,locally-disabled
         ,fixme
         ,no-member
+        ,not-callable
         ,wrong-import-position
         ,ungrouped-imports
         ,import-self

bin/frappy-cfg-editor

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 # pylint: disable=invalid-name
 # *****************************************************************************
+# Copyright (c) 2015-2024 by the authors, see LICENSE
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software

bin/frappy-cli

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # *****************************************************************************
-# Copyright (c) 2015-2016 by the authors, see LICENSE
+# Copyright (c) 2015-2024 by the authors, see LICENSE
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
@@ -24,10 +24,10 @@
 
 import sys
 import argparse
-from os import path
+from pathlib import Path
 
 # Add import path for inplace usage
-sys.path.insert(0, path.abspath(path.join(path.dirname(__file__), '..')))
+sys.path.insert(0, str(Path(__file__).absolute().parents[1]))
 
 from frappy.client.interactive import init, run, clientenv, interact
 
@@ -36,7 +36,7 @@ def parseArgv(argv):
     parser = argparse.ArgumentParser()
     parser.add_argument('-i', '--include',
                         help='file to execute after connecting to the clients', metavar='file',
-                        type=str, action='append', default=[])
+                        type=Path, action='append', default=[])
     parser.add_argument('-o', '--only-execute',
                         help='Do not go into interactive mode after executing files. \
                         Has no effect without --include.', action='store_true')

bin/frappy-gui

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # pylint: disable=invalid-name
 # *****************************************************************************
-# Copyright (c) 2015-2016 by the authors, see LICENSE
+# Copyright (c) 2015-2024 by the authors, see LICENSE
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
@@ -26,10 +26,10 @@ from __future__ import print_function
 
 import sys
 import argparse
-from os import path
+from pathlib import Path
 
 # Add import path for inplace usage
-sys.path.insert(0, path.abspath(path.join(path.dirname(__file__), '..')))
+sys.path.insert(0, str(Path(__file__).absolute().parents[1]))
 
 import logging
 from mlzlog import ColoredConsoleHandler
@@ -46,8 +46,11 @@ def parseArgv(argv):
     loggroup.add_argument('-q', '--quiet',
                           help='Supress everything but errors',
                           action='store_true', default=False)
+    parser.add_argument('-D', '--detailed',
+                        help='Start in detailed mode',
+                        action='store_true', default=False)
     parser.add_argument('node',
-                        help='Nodes the Gui should connect to.\n', metavar='host[:port]',
+                        help='Nodes the GUI should connect to.\n', metavar='host[:port]',
                         nargs='*', type=str, default=[])
     return parser.parse_args(argv)
 
@@ -61,13 +64,14 @@ def main(argv=None):
     loglevel = logging.DEBUG if args.debug else (logging.ERROR if args.quiet else logging.INFO)
     logger = logging.getLogger('gui')
     logger.setLevel(logging.DEBUG)
-    console = ColoredConsoleHandler()
-    console.setLevel(loglevel)
-    logger.addHandler(console)
+    if sys.stdout is not None:
+        console = ColoredConsoleHandler()
+        console.setLevel(loglevel)
+        logger.addHandler(console)
 
     app = QApplication(argv)
 
-    win = MainWindow(args.node, logger)
+    win = MainWindow(args, logger)
     app.aboutToQuit.connect(win._onQuit)
     win.show()
 

bin/frappy-play

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # *****************************************************************************
-# Copyright (c) 2015-2016 by the authors, see LICENSE
+# Copyright (c) 2015-2024 by the authors, see LICENSE
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
@@ -22,10 +22,10 @@
 # *****************************************************************************
 
 import sys
-from os import path
+from pathlib import Path
 
 # Add import path for inplace usage
-sys.path.insert(0, path.abspath(path.join(path.dirname(__file__), '..')))
+sys.path.insert(0, str(Path(__file__).absolute().parents[1]))
 
 from frappy.client.interactive import Console
 from frappy.playground import play, USAGE

bin/frappy-server

@@ -24,10 +24,10 @@
 
 import argparse
 import sys
-from os import path
+from pathlib import Path
 
 # Add import path for inplace usage
-sys.path.insert(0, path.abspath(path.join(path.dirname(__file__), '..')))
+sys.path.insert(0, str(Path(__file__).absolute().parents[1]))
 
 from frappy.lib import generalConfig
 from frappy.logging import logger

bin/make_doc.py

@@ -1,63 +0,0 @@
-#!/usr/bin/env python
-# *****************************************************************************
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-# Module authors:
-#   Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
-#
-# *****************************************************************************
-
-
-import os
-from os import path
-
-import markdown
-
-BASE_PATH = path.abspath(path.join(path.dirname(__file__), '..'))
-DOC_SRC = path.join(BASE_PATH, 'doc')
-DOC_DST = path.join(BASE_PATH, 'html')
-
-conv = markdown.Markdown()
-
-for dirpath, dirnames, filenames in os.walk(DOC_SRC):
-    # re-create the dir-structure of DOC_SRC into DOC_DST
-    dst_path = path.join(DOC_DST, path.relpath(dirpath, DOC_SRC))
-    try:
-        os.mkdir(dst_path)
-    except OSError:
-        pass
-
-    for fn in filenames:
-        full_name = path.join(dirpath, fn)
-        sub_name = path.relpath(full_name, DOC_SRC)
-        final_name = path.join(DOC_DST, sub_name)
-
-        if not fn.endswith('md'):
-            # just copy everything else
-            with open(full_name, 'rb') as fi:
-                with open(final_name, 'wb') as fo:
-                    # WARNING: possible Memory hog!
-                    fo.write(fi.read())
-            continue
-        # treat .md files special
-        final_sub_name = path.splitext(sub_name)[0] + '.html'
-        final_name = path.join(DOC_DST, final_sub_name)
-        print("Converting %s to %s" %(sub_name, final_sub_name))
-        # transform one file
-        conv.reset()
-        conv.convertFile(input=full_name,
-                         output=final_name,
-                         encoding="utf-8")

bin/sim-server

@@ -34,13 +34,13 @@ Use cases, mainly for test purposes:
 
 import sys
 import argparse
-from os import path
+from pathlib import Path
 import asyncore
 import socket
 import time
 
 # Add import path for inplace usage
-sys.path.insert(0, path.abspath(path.join(path.dirname(__file__), '..')))
+sys.path.insert(0, str(Path(__file__).absolute().parents[1]))
 
 from frappy.lib import get_class, formatException, mkthread
 
@@ -110,6 +110,7 @@ class Server(LineServer):
 
     def __init__(self, *args, **kwds):
         super().__init__(*args, **kwds)
+        self.secnode = None
         self.dispatcher = self.Dispatcher()
 
 

cfg/QnwTC1_cfg.py

@@ -6,7 +6,7 @@ Node('QnwTC1test.psi.ch',
 Mod('io',
     'frappy_psi.qnw.QnwIO',
     'connection for Quantum northwest',
-    uri='tcp://ldmcc01-ts:3004',
+    uri='tcp://ldm-fi-ts:3001',
     )
 
 Mod('T',

cfg/TFA10_cfg.py

@@ -6,7 +6,7 @@ Node('TFA10.psi.ch',
 Mod('io',
     'frappy_psi.thermofisher.ThermFishIO',
     'connection for ThermoFisher A10',
-    uri='tcp://ldmse-d910-ts:3001',
+    uri='tcp://ldm-fi-ts:3002',
     )
 
 Mod('T',

cfg/addons/camea-be-filter_cfg.py

@@ -14,4 +14,36 @@ Mod('t_be_filter',
     'Be filter T',
     io='sea_addons',
     sea_object='t_be_filter',
+    extra_modules=['a', 'b', 'c', 'd', 'det'],
 )
+
+Mod('t_be_fil_top_m',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_addons',
+    single_module='t_be_filter.a',
+)
+
+Mod('t_be_fil_top_r',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_addons',
+    single_module='t_be_filter.b',
+)
+
+Mod('t_be_fil_bot_l',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_addons',
+    single_module='t_be_filter.c',
+)
+
+Mod('t_be_fil_bot_r',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_addons',
+    single_module='t_be_filter.d',
+)
+
+Mod('t_detector',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_addons',
+    single_module='t_be_filter.det',
+)
+

cfg/addons/flamesample_cfg.py

@@ -44,6 +44,7 @@ Mod('ts_high',
 Mod('ts',
     'frappy_psi.parmod.SwitchDriv',
     'automatically switching between ts_low and ts_high',
+    meaning=['temperature', 40],
     value=Param(unit='K'),
     low='ts_low',
     high='ts_high',

cfg/addons/razorbill_cfg.py

@@ -0,0 +1,34 @@
+Node('cfg/addons/razorbill.cfg',
+     'razorbill forwarder',
+)
+
+Mod('sea_addons',
+    'frappy_psi.sea.SeaClient',
+    'SEA stick connection',
+    config='razorbill.addon',
+    service='addons',
+)
+
+Mod('ts',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_addons',
+    sea_object='tt',
+    json_file='ori6.config.json',
+    rel_paths=['ts'],
+)
+
+
+Mod('T_remote',
+    'frappy.proxy.Proxy',
+    'dummy (remote) T',
+    remote_class = 'frappy_psi.dummy.Temp',
+    uri='razorbill:3000',
+    module='T',
+    # export=False,
+)
+
+Mod('forwarder',
+    'frappy_psi.dummy.Forwarder',
+    'forwarder',
+    src='ts',
+    dst='T_remote')

cfg/addons/vsource_cfg.py

@@ -0,0 +1,44 @@
+Node('k2601b.psi.ch',
+     'source meter keithley 2601b',
+     interface='tcp://5000',
+)
+
+
+Mod('vsource_io',
+    'frappy_psi.k2601b.K2601bIO',
+    'source meter',
+#    uri = '129.129.156.90:5025',
+     uri = "sans-sample-ts:3011"
+)
+
+
+Mod('source',
+    'frappy_psi.k2601b.SourceMeter'
+    '',
+    description = "keithley sourcemeter",
+    mode = 1,
+    vlimit = 6.0,
+    ilimit = 2.,
+    io = 'vsource_io',
+)
+
+Mod('volt',
+    'frappy_psi.k2601b.Voltage'
+    '',
+    description = "Voltage Source",
+    active = True,
+    limit = 5.0,
+    target = 0.0,
+    sourcemeter = 'source',
+    io = 'vsource_io',
+)
+Mod('cur',
+    'frappy_psi.k2601b.Current'
+    '',
+    description = "Current Source",
+    active = False,
+    limit = 0.10,
+    target = 0.0,
+    sourcemeter = 'source',
+    io = 'vsource_io',
+)

cfg/lockin830_cfg.py

@@ -0,0 +1,16 @@
+Node('lockin830test.psi.ch',
+     'lockin830 test',
+     'tcp://5000',
+     )
+
+Mod('io',
+    'frappy_psi.SR830.SR830_IO',
+    'lockin communication',
+    uri='tcp://linse-976d-ts:3002',
+    )
+
+Mod('XY',
+    'frappy_psi.SR830.XY',
+    'XY channels',
+    io='io',
+    )

cfg/main/ccr2_cfg.py

@@ -11,6 +11,7 @@ Mod('sea_main',
 
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
+    meaning=['temperature', 20],
     io='sea_main',
     sea_object='tt',
 )

cfg/main/ccr2ht_cfg.py

@@ -12,6 +12,7 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature', 20],
     sea_object='tt',
 )
 

cfg/main/ccr3_cfg.py

@@ -12,5 +12,6 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature', 20],
     sea_object='tt',
 )

cfg/main/ccrpe_cfg.py

@@ -7,13 +7,14 @@ Mod('sea_main',
     config = 'ccrpe.config',
     service = 'main',
 )
-Mod('tt',
+Mod('ts',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature', 20],
     sea_object='tt',
-    rel_paths=['.', 'tm'],
+    rel_paths=['ts', 'set'],
 )
-Mod('ts',
+Mod('tm',
     'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
     sea_object='tt',

cfg/main/ccrpe_lowT_cfg.py

@@ -9,18 +9,19 @@ Mod('sea_main',
     service='main',
 )
 
-Mod('tt',
+Mod('ts',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature', 20],
     sea_object='tt',
-    rel_paths=['.', 'tm'],
+    rel_paths=['ts', 'set'],
 )
 
-Mod('ts',
+Mod('tm',
     'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
     sea_object='tt',
-    rel_paths=['ts'],
+    rel_paths=['tm'],
 )
 
 Mod('te',

cfg/main/cti5_cfg.py

@@ -12,5 +12,6 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature', 20],
     sea_object='tt',
 )

cfg/main/cti7_cfg.py

@@ -12,5 +12,6 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature', 20],
     sea_object='tt',
 )

cfg/main/cti7ht_cfg.py

@@ -11,6 +11,14 @@ Mod('sea_main',
 
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
+    meaning=['temperature', 20],
     io='sea_main',
     sea_object='tt',
 )
+
+Mod('th',
+    'frappy_psi.sea.SeaReadable', 'CTI cold finger temperature',
+    io='sea_main',
+    sea_object='tt',
+    rel_paths = ['te'],
+)

cfg/main/eurotherm_cfg.py

@@ -6,10 +6,11 @@ Mod('sea_main',
     'main sea connection for haakeuro.config',
     config = 'eurotherm.config',
     service = 'main',
-    meaning=('temperature', 11),
 )
 Mod('te',
     'frappy_psi.sea.SeaDrivable', '',
     io = 'sea_main',
+    meaning=['temperature', 20],
     sea_object = 'te',
+    meaning=('temperature', 11),
 )

cfg/main/fftf_cfg.py

@@ -12,6 +12,7 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature', 20],
     sea_object='tt',
 )
 

cfg/main/flamemag_cfg.py

@@ -1,12 +1,14 @@
 Node('flamemag.psi.ch',
      'flame magnet',
-     interface='tcp://5000'
+     interface='tcp://5000',
 )
 
+sea_cfg = 'flamemag.config'
+
 Mod('cio',
     'frappy_psi.cryoltd.IO',
     'IO to cryo ltd software',
-    uri='tcp://flamedil:3128',
+    uri='tcp://flamemag:3128',
 )
 
 Mod('main',

cfg/main/ft_cfg.py

@@ -13,7 +13,8 @@ Mod('ts',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
     sea_object='tt',
-    rel_paths=['.', 'ts'],
+    meaning=['temperature', 20],
+    rel_paths=['ts', 'set'],
 )
 
 Mod('t2',

cfg/main/fw_cfg.py

@@ -12,8 +12,9 @@ Mod('sea_main',
 Mod('ts',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature', 20],
     sea_object='tt',
-    rel_paths=['.', 'ts'],
+    rel_paths=['ts', 'set'],
 )
 
 Mod('t2',

cfg/main/ill1_cfg.py

@@ -12,7 +12,9 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 20],
     sea_object='tt',
+    rel_paths=['tm', 'set', 'dblctrl'],
 )
 
 Mod('cc',

cfg/main/ill2_cfg.py

@@ -12,7 +12,9 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 20],
     sea_object='tt',
+    rel_paths=['tm', 'set', 'dblctrl'],
 )
 
 Mod('cc',

cfg/main/ill3_cfg.py

@@ -12,7 +12,9 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 20],
     sea_object='tt',
+    rel_paths=['tm', 'set', 'dblctrl'],
 )
 
 Mod('cc',

cfg/main/ill4_cfg.py

@@ -12,7 +12,9 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 20],
     sea_object='tt',
+    rel_paths=['tm', 'set', 'dblctrl'],
 )
 
 Mod('cc',

cfg/main/ill5_cfg.py

@@ -12,7 +12,9 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 20],
     sea_object='tt',
+    rel_paths=['tm', 'set', 'dblctrl'],
 )
 
 Mod('cc',

cfg/main/ill5pgas5_cfg.py

@@ -12,7 +12,9 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 20],
     sea_object='tt',
+    rel_paths=['tm', 'set', 'dblctrl'],
 )
 
 Mod('pauto',

cfg/main/jtccr_cfg.py

@@ -12,8 +12,9 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 20],
     sea_object='tt',
-    rel_paths=['.', 'tt'],
+    rel_paths=['tt', 'set'],
 )
 
 Mod('T_ccr',

cfg/main/ma02_cfg.py

@@ -12,7 +12,9 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 20],
     sea_object='tt',
+    rel_paths=['tm', 'set', 'dblctrl'],
 )
 
 Mod('cc',

cfg/main/ma10_cfg.py

@@ -12,7 +12,9 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 20],
     sea_object='tt',
+    rel_paths=['tm', 'set', 'dblctrl'],
 )
 
 Mod('cc',

cfg/main/ma10heat_cfg.py

@@ -12,6 +12,7 @@ Mod('sea_main',
 Mod('ts',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 20],
     sea_object='tt',
     rel_paths=['ts', 'set']
 )

cfg/main/ma10high_t_cfg.py

@@ -13,6 +13,7 @@ Mod('th',
     'frappy_psi.sea.SeaReadable',
     'sample heater temperature',
     io='sea_main',
+    meaning=['temperature_regulation', 20],
     sea_object='tt',
     rel_paths=['ts', 'setsamp']
 )

cfg/main/ma11_cfg.py

@@ -12,8 +12,9 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 20],
     sea_object='tt',
-    rel_paths=['.', 'tm'],
+    rel_paths=['tm', 'set', 'dblctrl'],
 )
 
 Mod('cc',

cfg/main/ma15_cfg.py

@@ -10,8 +10,9 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io = 'sea_main',
+    meaning=['temperature_regulation', 20],
     sea_object = 'tt',
-    rel_paths = ['.', 'tm']
+    rel_paths=['tm', 'set', 'dblctrl'],
 )
 Mod('cc',
     'frappy_psi.sea.SeaReadable', '',

cfg/main/ma6_cfg.py

@@ -12,8 +12,9 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 20],
     sea_object='tt',
-    rel_paths=['.', 'tm'],
+    rel_paths=['tm', 'set', 'dblctrl'],
 )
 
 Mod('cc',

cfg/main/ma6_sampleheat_cfg.py

@@ -12,11 +12,11 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 20],
     sea_object='tt',
-    rel_paths=['tm', 'set'],
+    rel_paths=['tm', 'set', 'dblctrl'],
 )
 
-
 Mod('th',
     'frappy_psi.sea.SeaReadable',
     'sample heater temperature',

cfg/main/ma7_cfg.py

@@ -12,6 +12,7 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 20],
     sea_object='tt',
     rel_paths=['tm', 'set', 'dblctrl'],
 )

cfg/main/ma7_piezo_cfg.py

@@ -1,4 +1,4 @@
-Node('ma7.config.sea.psi.ch',
+Node('ma7_piezo.config.sea.psi.ch',
      '6.8 Tesla horizontal cryomagnet',
 )
 
@@ -12,6 +12,7 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 20],
     sea_object='tt',
     rel_paths=['tm', 'set', 'dblctrl', 'voltage'],
     extra_modules=['manualpower'],

cfg/main/ma7_sampleheat_cfg.py

@@ -4,7 +4,7 @@ Node('ma7.config.sea.psi.ch',
 
 Mod('sea_main',
     'frappy_psi.sea.SeaClient',
-    'main sea connection for ma7.config',
+    'main sea connection for ma7_sampleheat.config',
     config='ma7_sampleheat.config',
     service='main',
 )
@@ -12,9 +12,10 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 20],
     sea_object='tt',
-    rel_paths=['tm', 'set'],
-)
+    rel_paths=['tm', 'set', 'dblctrl'],
+    )
 
 Mod('th',
     'frappy_psi.sea.SeaReadable',
@@ -24,6 +25,7 @@ Mod('th',
     rel_paths=['ts_2', 'setsamp']
 )
 
+
 Mod('ts0',
     'frappy_psi.sea.SeaReadable',
     'sample stick exch. temperature',
@@ -36,13 +38,21 @@ 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,
 )
 
+#Mod('sampheat',
+#    'frappy_psi.sea.SeaWritable', '',
+#    io='sea_main',
+#    sea_object='tt',
+#    rel_paths=['ts_2', 'setsamp', 'manualpower']
+#)
+
+
 Mod('cc',
     'frappy_psi.sea.SeaReadable', '',
     io='sea_main',

cfg/main/ma7_thermalc_cfg.py

@@ -16,9 +16,10 @@ Mod('sea_main',
 
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
+    meaning=['temperature_regulation', 20],
     io='sea_main',
     sea_object='tt',
-    rel_paths=['tm', 'set'],
+    rel_paths=['tm', 'set', 'dblctrl'],
 )
 
 Mod('th',

cfg/main/ma7two_cfg.py

@@ -12,7 +12,9 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 20],
     sea_object='tt',
+    rel_paths=['tm', 'set', 'dblctrl'],
 )
 
 Mod('cc',

cfg/main/mb11_cfg.py

@@ -25,6 +25,7 @@ Mod('ips',
 Mod('T_stat',
     'frappy_psi.mercury.TemperatureAutoFlow',
     'static heat exchanger temperature',
+    meaning=['temperature_regulation', 20],
     output_module='htr_stat',
     needle_valve='p_stat',
     slot='DB6.T1',

cfg/main/mb11std_cfg.py

@@ -23,6 +23,7 @@ Mod('ips',
 Mod('T_stat',
     'frappy_psi.mercury.TemperatureAutoFlow',
     'static heat exchanger temperature',
+    meaning=['temperature_regulation', 20],
     output_module='htr_stat',
     needle_valve='p_stat',
     slot='DB6.T1',

cfg/main/ori3_cfg.py

@@ -12,7 +12,9 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 20],
     sea_object='tt',
+    rel_paths=['tm', 'set', 'dblctrl'],
 )
 
 Mod('cc',

cfg/main/ori4_cfg.py

@@ -9,17 +9,12 @@ Mod('sea_main',
     service='main',
 )
 
-Mod('t',
+Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 20],
     sea_object='tt',
-)
-
-Mod('tm',
-    'frappy_psi.sea.SeaDrivable', '',
-    io='sea_main',
-    sea_object='tt',
-    rel_paths=['tm'],
+    rel_paths=['tm', 'set', 'dblctrl'],
 )
 
 Mod('cc',

cfg/main/ori6_cfg.py

@@ -12,7 +12,9 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 20],
     sea_object='tt',
+    rel_paths=['tm', 'set', 'dblctrl'],
 )
 
 Mod('cc',

cfg/main/ori7_cfg.py

@@ -12,7 +12,9 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io = 'sea_main',
+    meaning=['temperature_regulation', 20],
     sea_object = 'tt',
+    rel_paths=['tm', 'set', 'dblctrl'],
 )
 
 Mod('cc',

cfg/main/rt_cfg.py

@@ -11,6 +11,7 @@ Mod('sea_main',
 
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
+    meaning=['temperature', 20],
     sea_object='tt',
     io='sea_main',
 )

cfg/main/variox_cfg.py

@@ -12,7 +12,9 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 20],
     sea_object='tt',
+    rel_paths=['tm', 'set', 'dblctrl'],
 )
 
 Mod('cc',

cfg/main/varioxb_cfg.py

@@ -1,22 +1,24 @@
 Node('varioxb.psi.ch',
-     'VarioxB - 100 mm cryostat (not tested!)',
+     'VarioxB - 100 mm cryostat',
+     interface='tcp://5000',
 )
 
 Mod('itc1',
     'frappy_psi.mercury.IO',
     'ITC for heat exchanger and pressures',
-    uri='mb11-ts:3001',
+    uri='linvb-ts:3001',
 )
 
 Mod('itc2',
     'frappy_psi.mercury.IO',
     'ITC for neck and nv heaters',
-    uri='mb11-ts:3002',
+    uri='linvb-ts:3002',
 )
 
 Mod('T_stat',
     'frappy_psi.mercury.TemperatureAutoFlow',
     'static heat exchanger temperature',
+    meaning=['temperature_regulation', 20],
     output_module='htr_stat',
     needle_valve='p_stat',
     slot='DB6.T1',
@@ -91,15 +93,15 @@ Mod('pos_dyn',
 Mod('lev',
     'frappy_psi.mercury.HeLevel',
     'LHe level',
-    slot='DB1.L1',
-    io='ips',
+    slot='DB4.L1',
+    io='itc2',
 )
 
 Mod('n2lev',
     'frappy_psi.mercury.N2Level',
     'LN2 level',
-    slot='DB1.L1',
-    io='ips',
+    slot='DB4.L1',
+    io='itc2',
 )
 
 Mod('T_neck1',
@@ -166,18 +168,18 @@ Mod('htr_nvd',
     io='itc2',
 )
 
-Mod('om_io',
-    'frappy_psi.phytron.PhytronIO',
-    'dom motor IO',
-    uri='mb11-ts.psi.ch:3004',
-)
+#Mod('om_io',
+#    'frappy_psi.phytron.PhytronIO',
+#    'dom motor IO',
+#    uri='mb11-ts.psi.ch:3004',
+#)
 
-Mod('om',
-    'frappy_psi.phytron.Motor',
-    'stick rotation, typically used for omega',
-    io='om_io',
-    target_min=-180,
-    target_max=360,
-    encoder_mode='NO',
-    target=Param(min=-180, max=360)
-)
+#Mod('om',
+#    'frappy_psi.phytron.Motor',
+#    'stick rotation, typically used for omega',
+#    io='om_io',
+#    target_min=-180,
+#    target_max=360,
+#    encoder_mode='NO',
+#    target=Param(min=-180, max=360)
+#)

cfg/multimeter_cfg.py

@@ -0,0 +1,34 @@
+Node('multimetertest.psi.ch',
+     'multimeter test',
+     'tcp://5000',
+     )
+
+Mod('io',
+     'frappy_psi.HP.HP_IO',
+     'multimeter communication',
+     uri='/dev/cu.usbserial-21410',
+     )
+
+Mod('Voltage',
+     'frappy_psi.HP.Voltage',
+     'voltage',
+     io='io',
+     )
+
+Mod('Current',
+     'frappy_psi.HP.Current',
+     'current',
+     io='io',
+     )
+
+Mod('Resistance',
+     'frappy_psi.HP.Resistance',
+     'resistivity',
+     io='io',
+     )
+
+Mod('Frequency',
+     'frappy_psi.HP.Frequency',
+     'resistivity',
+     io='io',
+     )

cfg/razorbillUC220T_cfg.py

@@ -0,0 +1,84 @@
+# call $ bin/frappy-server razorbillUC220T
+# in frappy directory, with python with frappy libraries installed.
+
+Node('UC220T.psi.ch',
+     'A Razorbill UC220T controlled by a RP100 high voltage powersupply and a ACM1219 (AD7746) capacitance meter',
+      interface='tcp://5123')
+
+Mod('io1',
+    'frappy_psi.RP100.RP100IO',
+    'communication',
+    uri='serial:///dev/ttyACM0?baudrate=9600+bytesize=8+parity=none+stopbits=1')
+Mod('V1',
+    'frappy_psi.RP100.VoltageChannel',
+    'Voltage Channel 1',
+    temp='T',
+    io='io1',
+    target=Param(min=-200, max=200),
+    max_target=120,
+    min_target=-20,
+    slew_rate=100,
+    channel=1)
+Mod('V2',
+    'frappy_psi.RP100.VoltageChannel',
+    'Voltage Channel 2',
+    temp='T',
+    io='io1',
+    target=Param(min=-200, max=200),
+    max_target=120,
+    min_target=-20,
+    slew_rate=100,
+    channel=2)
+
+Mod('io2',
+    'frappy_psi.ACM1219.ACM1219IO',
+    'communication',
+    uri='serial:///dev/ttyUSB0?baudrate=9600+bytesize=8+parity=none+stopbits=1')
+Mod('C1C2',
+    'frappy_psi.ACM1219.BothChannels',
+    'Capacitance channels 1 and 2',
+    io='io2')
+Mod('d',
+    'frappy_psi.ACM1219.Displacement',
+    'razorbill displacement from capacitance',
+    cap='C1C2',
+    channel=1,
+    alpha290K=56.710,
+    d0=95.443,
+    Cp=0.01883,
+    d0_curve={'a':4.21,'b':-0.00157,'c':-3.38e-5,'d':5.28e-8,'e':-6.93e-11},
+    temp='T')
+Mod('F',
+    'frappy_psi.ACM1219.Force',
+    'razorbill force from capacitance',
+    cap='C1C2',
+    channel=2,
+    alpha290K=374.23,
+    f0=315.63,
+    Cp=0.0755,
+    f0_curve={'a':38.9,'b':-0.0147,'c':-0.000346,'d':8.96e-7,'e':-1.58e-9},
+    temp='T')
+Mod('stress',
+    'frappy_psi.ACM1219.Stress',
+    'Sample stress from force',
+    force='F',
+    area=0.1,
+    )
+Mod('strain',
+    'frappy_psi.ACM1219.Strain',
+    'Sample strain from force',
+    displacement='d',
+    L=3,
+    )
+Mod('YM',
+    'frappy_psi.ACM1219.YoungsModulus',
+    'Sample youngs modulus from stress and strain',
+    stress='stress',
+    strain='strain',
+    )
+
+Mod('T',
+    'frappy_psi.dummy.Temp',
+    'dummy T written from client',
+    target=Param(min=1, max=325),
+    )

cfg/sea/camea-be-filter.addon.json

@@ -1,41 +1,13 @@
-{"t_be_filter": {"base": "/t_be_filter", "params": [
-{"path": "", "type": "none", "kids": 11},
-{"path": "send", "type": "text", "readonly": false, "cmd": "t_be_filter send", "visibility": 3},
-{"path": "status", "type": "text", "visibility": 3},
-{"path": "a", "type": "float", "kids": 4},
-{"path": "a/curve", "type": "text", "readonly": false, "cmd": "t_be_filter a/curve", "kids": 1},
-{"path": "a/curve/points", "type": "floatvarar", "readonly": false, "cmd": "t_be_filter a/curve/points", "visibility": 3},
-{"path": "a/alarm", "type": "float", "readonly": false, "cmd": "t_be_filter a/alarm"},
-{"path": "a/stddev", "type": "float"},
-{"path": "a/raw", "type": "float"},
-{"path": "b", "type": "float", "kids": 4},
-{"path": "b/curve", "type": "text", "readonly": false, "cmd": "t_be_filter b/curve", "kids": 1},
-{"path": "b/curve/points", "type": "floatvarar", "readonly": false, "cmd": "t_be_filter b/curve/points", "visibility": 3},
-{"path": "b/alarm", "type": "float", "readonly": false, "cmd": "t_be_filter b/alarm"},
-{"path": "b/stddev", "type": "float"},
-{"path": "b/raw", "type": "float"},
-{"path": "c", "type": "float", "kids": 4},
-{"path": "c/curve", "type": "text", "readonly": false, "cmd": "t_be_filter c/curve", "kids": 1},
-{"path": "c/curve/points", "type": "floatvarar", "readonly": false, "cmd": "t_be_filter c/curve/points", "visibility": 3},
-{"path": "c/alarm", "type": "float", "readonly": false, "cmd": "t_be_filter c/alarm"},
-{"path": "c/stddev", "type": "float"},
-{"path": "c/raw", "type": "float"},
-{"path": "d", "type": "float", "kids": 4},
-{"path": "d/curve", "type": "text", "readonly": false, "cmd": "t_be_filter d/curve", "kids": 1},
-{"path": "d/curve/points", "type": "floatvarar", "readonly": false, "cmd": "t_be_filter d/curve/points", "visibility": 3},
-{"path": "d/alarm", "type": "float", "readonly": false, "cmd": "t_be_filter d/alarm"},
-{"path": "d/stddev", "type": "float"},
-{"path": "d/raw", "type": "float"},
-{"path": "det", "type": "float", "kids": 4},
-{"path": "det/curve", "type": "text", "readonly": false, "cmd": "t_be_filter det/curve", "kids": 1},
-{"path": "det/curve/points", "type": "floatvarar", "readonly": false, "cmd": "t_be_filter det/curve/points", "visibility": 3},
-{"path": "det/alarm", "type": "float", "readonly": false, "cmd": "t_be_filter det/alarm"},
-{"path": "det/stddev", "type": "float"},
-{"path": "det/raw", "type": "float"},
-{"path": "display", "type": "text", "readonly": false, "cmd": "t_be_filter display"},
-{"path": "relay1", "type": "text", "readonly": false, "cmd": "t_be_filter relay1", "description": "may be 0,1,A,B,C,D for on,off or alarm channel"},
-{"path": "relay2", "type": "text", "readonly": false, "cmd": "t_be_filter relay2", "description": "may be 0,1,A,B,C,D for on,off or alarm channel"},
-{"path": "remote", "type": "bool"}]},
-
-"addonlock_camea-be-filter": {"base": "/addonlock_camea-be-filter", "params": [
-{"path": "", "type": "text", "readonly": false, "cmd": "addonlock_camea-be-filter = "}]}}
+{"t_be_filter":
+ {
+  "base": "/t_be_filter",
+  "params": [
+   {"path": "", "type": "none", "kids": 11},
+   {"path": "a", "type": "float"},
+   {"path": "b", "type": "float"},
+   {"path": "c", "type": "float"},
+   {"path": "d", "type": "float"},
+   {"path": "det", "type": "float"}
+   ]
+ }
+}

cfg/sea/ccr2.config.json

@@ -54,8 +54,6 @@
 {"path": "set/integ", "type": "float", "readonly": false, "cmd": "tt set/integ", "description": "bigger means faster"},
 {"path": "set/deriv", "type": "float", "readonly": false, "cmd": "tt set/deriv"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]}, "cc": {"base": "/cc", "params": [{"path": "", "type": "bool", "kids": 96},
 {"path": "send", "type": "text", "readonly": false, "cmd": "cc send", "visibility": 3},
 {"path": "status", "type": "text", "visibility": 3},

cfg/sea/ccr2ht.config.json

@@ -60,8 +60,6 @@
 {"path": "set/integ", "type": "float", "readonly": false, "cmd": "tt set/integ", "description": "bigger means faster"},
 {"path": "set/deriv", "type": "float", "readonly": false, "cmd": "tt set/deriv"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]}, "cc": {"base": "/cc", "params": [{"path": "", "type": "bool", "kids": 96},
 {"path": "send", "type": "text", "readonly": false, "cmd": "cc send", "visibility": 3},
 {"path": "status", "type": "text", "visibility": 3},

cfg/sea/ccr3.config.json

@@ -56,8 +56,6 @@
 {"path": "set/integ", "type": "float", "readonly": false, "cmd": "tt set/integ", "description": "bigger means faster"},
 {"path": "set/deriv", "type": "float", "readonly": false, "cmd": "tt set/deriv"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]},
 
 "cc": {"base": "/cc", "params": [

cfg/sea/cti5.config.json

@@ -50,8 +50,6 @@
 {"path": "set/integ", "type": "float", "readonly": false, "cmd": "tt set/integ", "description": "bigger means faster"},
 {"path": "set/deriv", "type": "float", "readonly": false, "cmd": "tt set/deriv"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]},
 
 "cc": {"base": "/cc", "params": [

cfg/sea/cti7.config.json

@@ -50,6 +50,4 @@
 {"path": "set/integ", "type": "float", "readonly": false, "cmd": "tt set/integ", "description": "bigger means faster"},
 {"path": "set/deriv", "type": "float", "readonly": false, "cmd": "tt set/deriv"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]}}

cfg/sea/cti7ht.config.json

@@ -56,6 +56,4 @@
 {"path": "set/integ", "type": "float", "readonly": false, "cmd": "tt set/integ", "description": "bigger means faster"},
 {"path": "set/deriv", "type": "float", "readonly": false, "cmd": "tt set/deriv"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]}}

cfg/sea/fs.config.json

@@ -56,8 +56,6 @@
 {"path": "set/integ", "type": "float", "readonly": false, "cmd": "tt set/integ", "description": "bigger means faster"},
 {"path": "set/deriv", "type": "float", "readonly": false, "cmd": "tt set/deriv"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]},
 
 "cc": {"base": "/cc", "params": [

cfg/sea/ft.config.json

@@ -68,8 +68,6 @@
 {"path": "set/integ", "type": "float", "readonly": false, "cmd": "tt set/integ", "description": "bigger means faster"},
 {"path": "set/deriv", "type": "float", "readonly": false, "cmd": "tt set/deriv"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]},
 
 "table": {"base": "/table", "params": [

cfg/sea/fw.config.json

@@ -62,8 +62,6 @@
 {"path": "set/integ", "type": "float", "readonly": false, "cmd": "tt set/integ", "description": "bigger means faster"},
 {"path": "set/deriv", "type": "float", "readonly": false, "cmd": "tt set/deriv"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]},
 
 "table": {"base": "/table", "params": [

cfg/sea/ill1.config.json

@@ -62,8 +62,6 @@
 {"path": "set/integ", "type": "float", "readonly": false, "cmd": "tt set/integ", "description": "bigger means faster"},
 {"path": "set/deriv", "type": "float", "readonly": false, "cmd": "tt set/deriv"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]},
 
 "cc": {"base": "/cc", "params": [
@@ -234,7 +232,7 @@
 {"path": "helow", "type": "float", "readonly": false, "cmd": "cc hl"}]},
 
 "hepump": {"base": "/hepump", "params": [
-{"path": "", "type": "enum", "enum": {"xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 10},
+{"path": "", "type": "enum", "enum": {"neodry": 8, "xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 10},
 {"path": "send", "type": "text", "readonly": false, "cmd": "hepump send", "visibility": 3},
 {"path": "status", "type": "text", "visibility": 3},
 {"path": "running", "type": "bool", "readonly": false, "cmd": "hepump running", "visibility": 3},

cfg/sea/ill2.config.json

@@ -62,8 +62,6 @@
 {"path": "set/integ", "type": "float", "readonly": false, "cmd": "tt set/integ", "description": "bigger means faster"},
 {"path": "set/deriv", "type": "float", "readonly": false, "cmd": "tt set/deriv"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]},
 
 "cc": {"base": "/cc", "params": [
@@ -234,7 +232,7 @@
 {"path": "helow", "type": "float", "readonly": false, "cmd": "cc hl"}]},
 
 "hepump": {"base": "/hepump", "params": [
-{"path": "", "type": "enum", "enum": {"xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 10},
+{"path": "", "type": "enum", "enum": {"neodry": 8, "xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 10},
 {"path": "send", "type": "text", "readonly": false, "cmd": "hepump send", "visibility": 3},
 {"path": "status", "type": "text", "visibility": 3},
 {"path": "running", "type": "bool", "readonly": false, "cmd": "hepump running", "visibility": 3},

cfg/sea/ill3.config.json

@@ -233,7 +233,7 @@
 {"path": "smooth", "type": "float"}]},
 
 "hepump": {"base": "/hepump", "params": [
-{"path": "", "type": "enum", "enum": {"xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 10},
+{"path": "", "type": "enum", "enum": {"neodry": 8, "xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 10},
 {"path": "send", "type": "text", "readonly": false, "cmd": "hepump send", "visibility": 3},
 {"path": "status", "type": "text", "visibility": 3},
 {"path": "running", "type": "bool", "readonly": false, "cmd": "hepump running"},

cfg/sea/ill4.config.json

@@ -62,8 +62,6 @@
 {"path": "set/integ", "type": "float", "readonly": false, "cmd": "tt set/integ", "description": "bigger means faster"},
 {"path": "set/deriv", "type": "float", "readonly": false, "cmd": "tt set/deriv"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]},
 
 "cc": {"base": "/cc", "params": [
@@ -234,7 +232,7 @@
 {"path": "helow", "type": "float", "readonly": false, "cmd": "cc hl"}]},
 
 "hepump": {"base": "/hepump", "params": [
-{"path": "", "type": "enum", "enum": {"xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 10},
+{"path": "", "type": "enum", "enum": {"neodry": 8, "xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 10},
 {"path": "send", "type": "text", "readonly": false, "cmd": "hepump send", "visibility": 3},
 {"path": "status", "type": "text", "visibility": 3},
 {"path": "running", "type": "bool", "readonly": false, "cmd": "hepump running", "visibility": 3},

cfg/sea/ill5.config.json

@@ -233,7 +233,7 @@
 {"path": "smooth", "type": "float"}]},
 
 "hepump": {"base": "/hepump", "params": [
-{"path": "", "type": "enum", "enum": {"xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 10},
+{"path": "", "type": "enum", "enum": {"neodry": 8, "xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 10},
 {"path": "send", "type": "text", "readonly": false, "cmd": "hepump send", "visibility": 3},
 {"path": "status", "type": "text", "visibility": 3},
 {"path": "running", "type": "bool", "readonly": false, "cmd": "hepump running"},

cfg/sea/ill5pgas5.config.json

@@ -296,7 +296,7 @@
 {"path": "helow", "type": "float", "readonly": false, "cmd": "cc hl"}]},
 
 "hepump": {"base": "/hepump", "params": [
-{"path": "", "type": "enum", "enum": {"xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 10},
+{"path": "", "type": "enum", "enum": {"neodry": 8, "xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 10},
 {"path": "send", "type": "text", "readonly": false, "cmd": "hepump send", "visibility": 3},
 {"path": "status", "type": "text", "visibility": 3},
 {"path": "running", "type": "bool", "readonly": false, "cmd": "hepump running"},

cfg/sea/ma02.config.json

@@ -63,8 +63,6 @@
 {"path": "set/deriv", "type": "float", "readonly": false, "cmd": "tt set/deriv"},
 {"path": "setsamp", "type": "float", "readonly": false, "cmd": "tt setsamp"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]},
 
 "cc": {"base": "/cc", "params": [
@@ -226,7 +224,7 @@
 {"path": "state", "type": "text"}]},
 
 "hepump": {"base": "/hepump", "params": [
-{"path": "", "type": "enum", "enum": {"xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 10},
+{"path": "", "type": "enum", "enum": {"neodry": 8, "xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 10},
 {"path": "send", "type": "text", "readonly": false, "cmd": "hepump send", "visibility": 3},
 {"path": "status", "type": "text", "visibility": 3},
 {"path": "running", "type": "bool", "readonly": false, "cmd": "hepump running", "visibility": 3},

cfg/sea/ma10.config.json

@@ -236,7 +236,7 @@
 {"path": "calib/mbar_offset", "type": "float", "readonly": false, "cmd": "nv calib/mbar_offset"}]},
 
 "hepump": {"base": "/hepump", "params": [
-{"path": "", "type": "enum", "enum": {"xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 10},
+{"path": "", "type": "enum", "enum": {"neodry": 8, "xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 10},
 {"path": "send", "type": "text", "readonly": false, "cmd": "hepump send", "visibility": 3},
 {"path": "status", "type": "text", "visibility": 3},
 {"path": "running", "type": "bool", "readonly": false, "cmd": "hepump running", "visibility": 3},

cfg/sea/ma10heat.config.json

@@ -236,7 +236,7 @@
 {"path": "calib/mbar_offset", "type": "float", "readonly": false, "cmd": "nv calib/mbar_offset"}]},
 
 "hepump": {"base": "/hepump", "params": [
-{"path": "", "type": "enum", "enum": {"xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 10},
+{"path": "", "type": "enum", "enum": {"neodry": 8, "xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 10},
 {"path": "send", "type": "text", "readonly": false, "cmd": "hepump send", "visibility": 3},
 {"path": "status", "type": "text", "visibility": 3},
 {"path": "running", "type": "bool", "readonly": false, "cmd": "hepump running"},

cfg/sea/ma10high_t.config.json

@@ -236,7 +236,7 @@
 {"path": "calib/mbar_offset", "type": "float", "readonly": false, "cmd": "nv calib/mbar_offset"}]},
 
 "hepump": {"base": "/hepump", "params": [
-{"path": "", "type": "enum", "enum": {"xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 10},
+{"path": "", "type": "enum", "enum": {"neodry": 8, "xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 10},
 {"path": "send", "type": "text", "readonly": false, "cmd": "hepump send", "visibility": 3},
 {"path": "status", "type": "text", "visibility": 3},
 {"path": "running", "type": "bool", "readonly": false, "cmd": "hepump running"},

cfg/sea/ma11.config.json

@@ -231,7 +231,7 @@
 {"path": "autoflow/flowtarget", "type": "float"},
 {"path": "calib", "type": "none", "kids": 2},
 {"path": "calib/ln_per_min_per_mbar", "type": "float", "readonly": false, "cmd": "nv calib/ln_per_min_per_mbar"},
-{"path": "calib/mbar_offset", "type": "float", "readonly": false, "cmd": "nv calib/mbar_offset"}]}, "hepump": {"base": "/hepump", "params": [{"path": "", "type": "enum", "enum": {"xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 9},
+{"path": "calib/mbar_offset", "type": "float", "readonly": false, "cmd": "nv calib/mbar_offset"}]}, "hepump": {"base": "/hepump", "params": [{"path": "", "type": "enum", "enum": {"neodry": 8, "xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 9},
 {"path": "send", "type": "text", "readonly": false, "cmd": "hepump send", "visibility": 3},
 {"path": "status", "type": "text", "visibility": 3},
 {"path": "running", "type": "bool", "readonly": false, "cmd": "hepump running"},

cfg/sea/ma6.config.json

@@ -236,7 +236,7 @@
 {"path": "calib/mbar_offset", "type": "float", "readonly": false, "cmd": "nv calib/mbar_offset"}]},
 
 "hepump": {"base": "/hepump", "params": [
-{"path": "", "type": "enum", "enum": {"xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 10},
+{"path": "", "type": "enum", "enum": {"neodry": 8, "xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 10},
 {"path": "send", "type": "text", "readonly": false, "cmd": "hepump send", "visibility": 3},
 {"path": "status", "type": "text", "visibility": 3},
 {"path": "running", "type": "bool", "readonly": false, "cmd": "hepump running"},

cfg/sea/ma7_sampleheat.config.json

@@ -367,14 +367,14 @@
 {"path": "send", "type": "text", "readonly": false, "cmd": "tcoil send", "visibility": 3},
 {"path": "status", "type": "text", "visibility": 3},
 {"path": "excitation", "type": "float", "readonly": false, "cmd": "tcoil excitation", "visibility": 3},
-{"path": "ta", "type": "float", "visibility": 3, "kids": 3},
+{"path": "ta", "type": "float", "kids": 3},
 {"path": "ta/enable", "type": "bool", "readonly": false, "cmd": "tcoil ta/enable"},
 {"path": "ta/r", "type": "float"},
 {"path": "ta/curve", "type": "text", "readonly": false, "cmd": "tcoil ta/curve", "kids": 3},
 {"path": "ta/curve/adjust", "type": "text", "readonly": false, "cmd": "tcoil ta/curve/adjust"},
 {"path": "ta/curve/points", "type": "floatvarar", "readonly": false, "cmd": "tcoil ta/curve/points"},
 {"path": "ta/curve/cpoints", "type": "floatvarar", "readonly": false, "cmd": "tcoil ta/curve/cpoints"},
-{"path": "tb", "type": "float", "visibility": 3, "kids": 3},
+{"path": "tb", "type": "float", "kids": 3},
 {"path": "tb/enable", "type": "bool", "readonly": false, "cmd": "tcoil tb/enable"},
 {"path": "tb/r", "type": "float"},
 {"path": "tb/curve", "type": "text", "readonly": false, "cmd": "tcoil tb/curve", "kids": 3},

cfg/sea/ma7two.config.json

@@ -215,7 +215,7 @@
 {"path": "vext", "type": "float"}]},
 
 "hepump": {"base": "/hepump", "params": [
-{"path": "", "type": "enum", "enum": {"xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 10},
+{"path": "", "type": "enum", "enum": {"neodry": 8, "xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 10},
 {"path": "send", "type": "text", "readonly": false, "cmd": "hepump send", "visibility": 3},
 {"path": "status", "type": "text", "visibility": 3},
 {"path": "running", "type": "bool", "readonly": false, "cmd": "hepump running", "visibility": 3},

cfg/sea/mb11.config.json

@@ -1,5 +1,5 @@
 {"hepump": {"base": "/hepump", "params": [
-{"path": "", "type": "enum", "enum": {"xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 10},
+{"path": "", "type": "enum", "enum": {"neodry": 8, "xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 10},
 {"path": "send", "type": "text", "readonly": false, "cmd": "hepump send", "visibility": 3},
 {"path": "status", "type": "text", "visibility": 3},
 {"path": "running", "type": "bool", "readonly": false, "cmd": "hepump running", "visibility": 3},

cfg/sea/ori3.config.json

@@ -62,8 +62,6 @@
 {"path": "set/integ", "type": "float", "readonly": false, "cmd": "tt set/integ", "description": "bigger means faster"},
 {"path": "set/deriv", "type": "float", "readonly": false, "cmd": "tt set/deriv"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]},
 
 "cc": {"base": "/cc", "params": [
@@ -234,7 +232,7 @@
 {"path": "helow", "type": "float", "readonly": false, "cmd": "cc hl"}]},
 
 "hepump": {"base": "/hepump", "params": [
-{"path": "", "type": "enum", "enum": {"xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 10},
+{"path": "", "type": "enum", "enum": {"neodry": 8, "xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 10},
 {"path": "send", "type": "text", "readonly": false, "cmd": "hepump send", "visibility": 3},
 {"path": "status", "type": "text", "visibility": 3},
 {"path": "running", "type": "bool", "readonly": false, "cmd": "hepump running"},

cfg/sea/ori4.config.json

@@ -240,7 +240,7 @@
 {"path": "fast", "type": "enum", "enum": {"slow": 0, "fast": 1}, "readonly": false, "cmd": "cc hf"},
 {"path": "state", "type": "text"},
 {"path": "hefull", "type": "float", "readonly": false, "cmd": "cc hh"},
-{"path": "helow", "type": "float", "readonly": false, "cmd": "cc hl"}]}, "hepump": {"base": "/hepump", "params": [{"path": "", "type": "enum", "enum": {"xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 9},
+{"path": "helow", "type": "float", "readonly": false, "cmd": "cc hl"}]}, "hepump": {"base": "/hepump", "params": [{"path": "", "type": "enum", "enum": {"neodry": 8, "xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 9},
 {"path": "send", "type": "text", "readonly": false, "cmd": "hepump send", "visibility": 3},
 {"path": "status", "type": "text", "visibility": 3},
 {"path": "running", "type": "bool", "readonly": false, "cmd": "hepump running"},

cfg/sea/ori6.config.json

@@ -232,7 +232,7 @@
 {"path": "helow", "type": "float", "readonly": false, "cmd": "cc hl"}]},
 
 "hepump": {"base": "/hepump", "params": [
-{"path": "", "type": "enum", "enum": {"xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 10},
+{"path": "", "type": "enum", "enum": {"neodry": 8, "xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 10},
 {"path": "send", "type": "text", "readonly": false, "cmd": "hepump send", "visibility": 3},
 {"path": "status", "type": "text", "visibility": 3},
 {"path": "running", "type": "bool", "readonly": false, "cmd": "hepump running", "visibility": 3},

cfg/sea/ori7.config.json

@@ -1,5 +1,5 @@
 {"tt": {"base": "/tt", "params": [
-{"path": "", "type": "float", "readonly": false, "cmd": "run tt", "description": "tt", "kids": 19},
+{"path": "", "type": "float", "readonly": false, "cmd": "run tt", "description": "tt", "kids": 17},
 {"path": "send", "type": "text", "readonly": false, "cmd": "tt send", "visibility": 3},
 {"path": "status", "type": "text", "visibility": 3},
 {"path": "is_running", "type": "int", "readonly": false, "cmd": "tt is_running", "visibility": 3},
@@ -30,12 +30,12 @@
 {"path": "tm/alarm", "type": "float", "readonly": false, "cmd": "tt tm/alarm"},
 {"path": "tm/stddev", "type": "float"},
 {"path": "tm/raw", "type": "float"},
-{"path": "ts", "type": "float", "visibility": 3, "kids": 4},
-{"path": "ts/curve", "type": "text", "readonly": false, "cmd": "tt ts/curve", "visibility": 3, "kids": 1},
+{"path": "ts", "type": "float", "kids": 4},
+{"path": "ts/curve", "type": "text", "readonly": false, "cmd": "tt ts/curve", "kids": 1},
 {"path": "ts/curve/points", "type": "floatvarar", "readonly": false, "cmd": "tt ts/curve/points", "visibility": 3},
-{"path": "ts/alarm", "type": "float", "readonly": false, "cmd": "tt ts/alarm", "visibility": 3},
-{"path": "ts/stddev", "type": "float", "visibility": 3},
-{"path": "ts/raw", "type": "float", "visibility": 3},
+{"path": "ts/alarm", "type": "float", "readonly": false, "cmd": "tt ts/alarm"},
+{"path": "ts/stddev", "type": "float"},
+{"path": "ts/raw", "type": "float"},
 {"path": "ts_2", "type": "float", "visibility": 3, "kids": 4},
 {"path": "ts_2/curve", "type": "text", "readonly": false, "cmd": "tt ts_2/curve", "visibility": 3, "kids": 1},
 {"path": "ts_2/curve/points", "type": "floatvarar", "readonly": false, "cmd": "tt ts_2/curve/points", "visibility": 3},
@@ -62,8 +62,6 @@
 {"path": "set/integ", "type": "float", "readonly": false, "cmd": "tt set/integ", "description": "bigger means faster"},
 {"path": "set/deriv", "type": "float", "readonly": false, "cmd": "tt set/deriv"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]},
 
 "cc": {"base": "/cc", "params": [
@@ -91,7 +89,7 @@
 {"path": "mcr", "type": "float"},
 {"path": "mot", "type": "float"},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open"},
-{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float"},
 {"path": "hr", "type": "float"},
 {"path": "hc", "type": "float"},
@@ -166,15 +164,16 @@
 {"path": "bdl", "type": "float", "readonly": false, "cmd": "cc bdl"}]},
 
 "nv": {"base": "/nv", "params": [
-{"path": "", "type": "enum", "enum": {"fixed": 0, "controlled": 1, "automatic": 2, "close": 3, "open": 4}, "readonly": false, "cmd": "nv", "kids": 11},
+{"path": "", "type": "enum", "enum": {"fixed": 0, "controlled": 1, "automatic": 2, "close": 3, "open": 4}, "readonly": false, "cmd": "nv", "kids": 12},
 {"path": "send", "type": "text", "readonly": false, "cmd": "nv send", "visibility": 3},
 {"path": "status", "type": "text", "visibility": 3},
 {"path": "motstat", "type": "enum", "enum": {"idle": 0, "opening": 1, "closing": 2, "opened": 3, "closed": 4, "no_motor": 5}},
 {"path": "flow", "type": "float"},
 {"path": "set", "type": "float", "readonly": false, "cmd": "nv set"},
 {"path": "flowmax", "type": "float", "readonly": false, "cmd": "nv flowmax"},
-{"path": "flowp", "type": "float"},
+{"path": "flowp", "type": "float", "description": "flow calculated from pressure before pump"},
 {"path": "span", "type": "float"},
+{"path": "use_pressure", "type": "bool", "readonly": false, "cmd": "nv use_pressure", "description": "use pressure instead of flow meter for control"},
 {"path": "ctrl", "type": "none", "kids": 13},
 {"path": "ctrl/regtext", "type": "text"},
 {"path": "ctrl/prop_o", "type": "float", "readonly": false, "cmd": "nv ctrl/prop_o", "description": "prop [sec/mbar] when opening. above 4 mbar a 10 times lower value is used"},
@@ -225,14 +224,17 @@
 {"path": "state", "type": "text"}]},
 
 "hefill": {"base": "/hefill", "params": [
-{"path": "", "type": "enum", "enum": {"watching": 0, "fill": 1, "inactive": 2, "manualfill": 3}, "readonly": false, "cmd": "hefill", "kids": 7},
+{"path": "", "type": "enum", "enum": {"watching": 0, "fill": 1, "inactive": 2, "manualfill": 3}, "readonly": false, "cmd": "hefill", "kids": 10},
 {"path": "send", "type": "text", "readonly": false, "cmd": "hefill send", "visibility": 3},
 {"path": "status", "type": "text", "visibility": 3},
 {"path": "fast", "type": "enum", "enum": {"slow": 0, "fast": 1}, "readonly": false, "cmd": "cc hf"},
 {"path": "state", "type": "text"},
 {"path": "hefull", "type": "float", "readonly": false, "cmd": "cc hh"},
 {"path": "helow", "type": "float", "readonly": false, "cmd": "cc hl"},
-{"path": "smooth", "type": "float"}]},
+{"path": "smooth", "type": "float"},
+{"path": "undershoot", "type": "float", "readonly": false, "cmd": "hefill undershoot"},
+{"path": "minfillminutes", "type": "float", "readonly": false, "cmd": "hefill minfillminutes"},
+{"path": "maxfillminutes", "type": "float", "readonly": false, "cmd": "hefill maxfillminutes"}]},
 
 "hepump": {"base": "/hepump", "params": [
 {"path": "", "type": "enum", "enum": {"neodry": 8, "xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 10},
@@ -307,4 +309,11 @@
 {"path": "tbl_tt_dblctrl_prop_up", "type": "text", "readonly": false, "cmd": "table tbl_tt_dblctrl_prop_up", "description": "enter value pair separated with colon T1:par1 T2:par2 ..."},
 {"path": "fix_tt_dblctrl_prop_lo", "type": "bool", "readonly": false, "cmd": "table fix_tt_dblctrl_prop_lo"},
 {"path": "val_tt_dblctrl_prop_lo", "type": "float"},
-{"path": "tbl_tt_dblctrl_prop_lo", "type": "text", "readonly": false, "cmd": "table tbl_tt_dblctrl_prop_lo", "description": "enter value pair separated with colon T1:par1 T2:par2 ..."}]}}
+{"path": "tbl_tt_dblctrl_prop_lo", "type": "text", "readonly": false, "cmd": "table tbl_tt_dblctrl_prop_lo", "description": "enter value pair separated with colon T1:par1 T2:par2 ..."}]},
+
+"dilpars": {"base": "/dilpars", "params": [
+{"path": "", "type": "none", "kids": 4},
+{"path": "send", "type": "text", "readonly": false, "cmd": "dilpars send", "visibility": 3},
+{"path": "status", "type": "text", "visibility": 3},
+{"path": "condenseflow", "type": "float", "readonly": false, "cmd": "dilpars condenseflow", "visibility": 3},
+{"path": "circulateflow", "type": "float", "readonly": false, "cmd": "dilpars circulateflow", "visibility": 3}]}}

cfg/sea/rt.config.json

@@ -21,8 +21,6 @@
 {"path": "tm/stddev", "type": "float"},
 {"path": "tm/raw", "type": "float"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]},
 
 "cc": {"base": "/cc", "params": [

cfg/sea/sch5.stick.json

@@ -69,8 +69,6 @@
 {"path": "set/integ", "type": "float", "readonly": false, "cmd": "tt set/integ", "description": "bigger means faster"},
 {"path": "set/deriv", "type": "float", "readonly": false, "cmd": "tt set/deriv"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]}, "cc": {"base": "/cc", "params": [{"path": "", "type": "bool", "kids": 96},
 {"path": "send", "type": "text", "readonly": false, "cmd": "cc send", "visibility": 3},
 {"path": "status", "type": "text", "visibility": 3},
@@ -249,7 +247,7 @@
 {"path": "fast", "type": "enum", "enum": {"slow": 0, "fast": 1}, "readonly": false, "cmd": "cc hf"},
 {"path": "state", "type": "text"},
 {"path": "hefull", "type": "float", "readonly": false, "cmd": "cc hh"},
-{"path": "helow", "type": "float", "readonly": false, "cmd": "cc hl"}]}, "hepump": {"base": "/hepump", "params": [{"path": "", "type": "enum", "enum": {"xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 9},
+{"path": "helow", "type": "float", "readonly": false, "cmd": "cc hl"}]}, "hepump": {"base": "/hepump", "params": [{"path": "", "type": "enum", "enum": {"neodry": 8, "xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 9},
 {"path": "send", "type": "text", "readonly": false, "cmd": "hepump send", "visibility": 3},
 {"path": "status", "type": "text", "visibility": 3},
 {"path": "running", "type": "bool", "readonly": false, "cmd": "hepump running"},

cfg/sea/thermalcond.stick.json

@@ -71,6 +71,22 @@
 {"path": "s4/curve/points", "type": "floatvarar", "readonly": false, "cmd": "res s4/curve/points", "visibility": 3},
 {"path": "s4/alarm", "type": "float", "readonly": false, "cmd": "res s4/alarm"},
 {"path": "s4/raw", "type": "float"},
+{"path": "s5", "type": "float", "kids": 14},
+{"path": "s5/active", "type": "enum", "enum": {"inactive": 0, "active": 1}, "readonly": false, "cmd": "res s5/active"},
+{"path": "s5/autorange", "type": "bool", "readonly": false, "cmd": "res s5/autorange", "description": "autorange (common for all channels)"},
+{"path": "s5/range", "type": "text", "readonly": false, "cmd": "res s5/range", "description": "resistance range in Ohm"},
+{"path": "s5/range_num", "type": "int"},
+{"path": "s5/excitation", "type": "text", "readonly": false, "cmd": "res s5/excitation", "description": "excitation with unit, i.e. 2uV or 3pA"},
+{"path": "s5/excitation_num", "type": "int"},
+{"path": "s5/excitation_mode", "type": "enum", "enum": {"voltage": 0, "current": 1, "off": 2}},
+{"path": "s5/pause", "type": "int", "readonly": false, "cmd": "res s5/pause", "description": "pause time [sec] after channel change"},
+{"path": "s5/filter", "type": "int", "readonly": false, "cmd": "res s5/filter", "description": "filter average time [sec]"},
+{"path": "s5/dwell", "type": "int", "readonly": false, "cmd": "res s5/dwell", "description": "dwell time [sec]. Total time per channel: pause + filter + dwell"},
+{"path": "s5/status", "type": "text"},
+{"path": "s5/curve", "type": "text", "readonly": false, "cmd": "res s5/curve", "kids": 1},
+{"path": "s5/curve/points", "type": "floatvarar", "readonly": false, "cmd": "res s5/curve/points", "visibility": 3},
+{"path": "s5/alarm", "type": "float", "readonly": false, "cmd": "res s5/alarm"},
+{"path": "s5/raw", "type": "float"},
 {"path": "analog2", "type": "float", "readonly": false, "cmd": "res analog2"},
 {"path": "remote", "type": "bool"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "res display"}]}}

cfg/sea/variox.config.json

@@ -62,8 +62,6 @@
 {"path": "set/integ", "type": "float", "readonly": false, "cmd": "tt set/integ", "description": "bigger means faster"},
 {"path": "set/deriv", "type": "float", "readonly": false, "cmd": "tt set/deriv"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]},
 
 "cc": {"base": "/cc", "params": [
@@ -234,7 +232,7 @@
 {"path": "helow", "type": "float", "readonly": false, "cmd": "cc hl"}]},
 
 "hepump": {"base": "/hepump", "params": [
-{"path": "", "type": "enum", "enum": {"xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 10},
+{"path": "", "type": "enum", "enum": {"neodry": 8, "xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 10},
 {"path": "send", "type": "text", "readonly": false, "cmd": "hepump send", "visibility": 3},
 {"path": "status", "type": "text", "visibility": 3},
 {"path": "running", "type": "bool", "readonly": false, "cmd": "hepump running", "visibility": 3},

cfg/sim921_cfg.py

@@ -0,0 +1,67 @@
+Node('bridge.psi.ch',
+     'ac resistance bridge',
+     'tcp://5000',
+     )
+
+Mod('io',
+    'frappy_psi.bridge.BridgeIO',
+    'communication to sim900',
+    uri='serial:///dev/cu.usbserial-14340',
+    )
+
+Mod('res1',
+    'frappy_psi.bridge.Resistance',
+    'module communication',
+    io='io',
+    port=1,
+    )
+
+Mod('res2',
+    'frappy_psi.bridge.Resistance',
+    'module communication',
+    io='io',
+    port=3,
+    )
+
+Mod('res3',
+    'frappy_psi.bridge.Resistance',
+    'module communication',
+    io='io',
+    port=5,
+    )
+
+Mod('phase1',
+    'frappy_psi.bridge.Phase',
+    'module communication',
+    resistance='res1',
+    )
+
+Mod('phase2',
+    'frappy_psi.bridge.Phase',
+    'module communication',
+    resistance='res2',
+    )
+
+Mod('phase3',
+    'frappy_psi.bridge.Phase',
+    'module communication',
+    resistance='res3',
+    )
+
+Mod('dev1',
+    'frappy_psi.bridge.Deviation',
+    'module communication',
+    resistance='res1',
+    )
+
+Mod('dev2',
+    'frappy_psi.bridge.Deviation',
+    'module communication',
+    resistance='res1',
+    )
+
+Mod('dev3',
+    'frappy_psi.bridge.Deviation',
+    'module communication',
+    resistance='res3',
+    )

cfg/sim_mlz_amagnet_cfg.py

@@ -100,10 +100,10 @@ Mod('currentsource',
 Mod('mf',
     'frappy_mlz.amagnet.GarfieldMagnet',
     'magnetic field module, handling polarity switching and stuff',
-    subdev_currentsource='currentsource',
-    subdev_enable='enable',
-    subdev_polswitch='polarity',
-    subdev_symmetry='symmetry',
+    currentsource='currentsource',
+    enable='enable',
+    polswitch='polarity',
+    symmetry='symmetry',
     target = Param(unit='T'),
     value = Param(unit='T'),
     userlimits=(-0.35, 0.35),

cfg/sim_mlz_ccidu1_cfg.py

@@ -91,6 +91,7 @@ Mod('ccidu1_V6',
     'frappy.simulation.SimDrivable',
     'Needle valve',
     value = Param(default=99, datatype={"type":"double", "min":0, "max":100, "unit":"%%"}),
+    target = Param(min=0, max=100),
     visibility='expert',
 )
 

cfg/stick/dil2_cfg.py

@@ -11,6 +11,7 @@ Mod('sea_stick',
 
 Mod('ts',
     'frappy_psi.sea.SeaDrivable', '',
+    meaning=['temperature', 30],
     io='sea_stick',
     sea_object='ts',
 )

cfg/stick/dil3_cfg.py

@@ -11,6 +11,7 @@ Mod('sea_stick',
 
 Mod('ts',
     'frappy_psi.sea.SeaDrivable', '',
+    meaning=['temperature', 30],
     io='sea_stick',
     sea_object='ts',
 )

cfg/stick/dil4_cfg.py

@@ -11,6 +11,7 @@ Mod('sea_stick',
 
 Mod('ts',
     'frappy_psi.sea.SeaDrivable', '',
+    meaning=['temperature', 30],
     io='sea_stick',
     sea_object='ts',
 )

cfg/stick/dil5_cfg.py

@@ -11,7 +11,7 @@ Mod('triton',
     timeout=25.0,
 )
 
-Mod('ts',
+Mod('T_mix',
     'frappy_psi.triton.TemperatureLoop',
     'mix. chamber temperature',
     slot='T5',
@@ -24,9 +24,21 @@ Mod('htr_mix',
     'mix. chamber heater',
     slot='H1,T5',
     io='triton',
-    resistivity = 100
+    resistivity = 100,
 )
 
+Mod('ts',
+    'frappy_psi.picontrol.PI',
+    'softloop controlled Temperature mixing chamber',
+    meaning=['temperature', 30],
+    input_module = 'T_mix',
+    output_module = 'htr_mix',
+    control_active = 1,
+    output_range = (0, 100000),
+    p = 20000,
+    i = 100,
+   )
+
 Mod('htr_sorb',
     'frappy_psi.triton.HeaterOutput',
     'sorb heater',
@@ -124,12 +136,12 @@ Mod('T_still_wup',
     io='itc',
 )
 
-Mod('htr_still_wup',
-    'frappy_psi.mercury.HeaterOutput',
-    'still warmup heater',
-    slot='MB0.H1',
-    io='itc',
-)
+#Mod('htr_still_wup',
+#    'frappy_psi.mercury.HeaterOutput',
+#    'still warmup heater',
+#    slot='MB0.H1',
+#    io='itc',
+#)
 
 Mod('T_one_K',
     'frappy_psi.mercury.TemperatureLoop',

cfg/stick/flamedil_cfg.py

@@ -5,6 +5,7 @@ Node('triton.psi.ch',
 Mod('T_mix',
     'frappy_psi.triton.TemperatureLoop',
     'mix. chamber temperature',
+    meaning=['temperature', 30],
     slot='T5',
     output_module='htr_mix',
     io='triton',