microsoft · damazter · Feb 17, 2016 · Feb 18, 2016 · Feb 18, 2016 · Feb 22, 2016
diff --git a/docs/examples/Qcodes example ATS_ONWORK.ipynb b/docs/examples/Qcodes example ATS_ONWORK.ipynb
diff --git a/qcodes/instrument/base.py b/qcodes/instrument/base.py
@@ -81,7 +81,7 @@ def __new__(cls, *args, server_name='', **kwargs):
             return RemoteInstrument(*args, instrument_class=cls,
                                     server_name=server_name, **kwargs)
 
-    def __init__(self, name, server_name=None, **kwargs):
+    def __init__(self, name, server_name=None, server=None, **kwargs):
         self._t0 = time.time()
         super().__init__(**kwargs)
         self.parameters = {}

diff --git a/qcodes/instrument/server.py b/qcodes/instrument/server.py
@@ -154,7 +154,7 @@ def handle_new(self, instrument_class, new_id, *args, **kwargs):
         for key, value in self._shared_attrs.items():
             if key in instrument_class.shared_kwargs:
                 kwargs[key] = value
-        ins = instrument_class(*args, server_name=None, **kwargs)
+        ins = instrument_class(*args, server_name=None, server=self, **kwargs)
 
         self.instruments[new_id] = ins