revert previous and fix: config is no longer a mixin

base.py

@@ -98,6 +98,7 @@ class Config:
     """merge info from linsetools.cfg and instrument.cfg"""
     this = None
     single_instrument = None
+    ins_config = None
 
     def __init__(self, instrument=None):
         configfile = Path('/sq_sw/linse/etc/linsetools.cfg')
@@ -215,15 +216,15 @@ def wait_status(cl, service):
         return True
 
 
-class MarcheControl(Config):
+class MarcheControl:
     port = 8124
     otherarg = None
     argmap = {k: 'action' for k in ('start', 'restart', 'stop', 'gui', 'run', 'cli', 'list', 'listcfg', 'running')}
 
-    def __init__(self, instrument=None, host='localhost', port=None, user=None):
-        super().__init__(instrument)
+    def __init__(self, instrument=None, host='localhost', port=None, user=None, config=None):
+        self.config = config or Config(instrument)
         self.host = host
-        self.user = user or self.instrument  # SINQ instruments
+        self.user = user or self.config.instrument  # SINQ instruments
         if not (Path('/home') / self.user).is_dir():
             self.user = 'l_samenv'
         if port is not None: