Merged in PhyNerd/lyse/labconfig-port (pull request labscript-suite#27)

removed hardcoded port

Approved-by: Philip Starkey <philip.starkey@monash.edu>
Approved-by: Chris Billington <chrisjbillington@gmail.com>

Author: chrisjbillington

__init__.py

@@ -22,6 +22,7 @@
 import sys
 
 import labscript_utils.h5_lock, h5py
+from labscript_utils.labconfig import LabConfig
 import pandas
 from numpy import array, ndarray
 import types
@@ -46,6 +47,13 @@
 # data to be sent back to the lyse GUI if running within lyse
 _updated_data = {}
 
+# get port that lyse is using for communication
+try:
+    _labconfig = LabConfig(required_params={"ports": ["lyse"]})
+    _lyse_port = int(_labconfig.get('ports', 'lyse'))
+except Exception:
+    _lyse_port = 42519
+
 if len(sys.argv) > 1:
     path = sys.argv[1]
 else:
@@ -65,11 +73,10 @@ class _RoutineStorage(object):
 routine_storage = _RoutineStorage()
 
 
-def data(filepath=None, host='localhost', timeout=5):
+def data(filepath=None, host='localhost', port=_lyse_port, timeout=5):
     if filepath is not None:
         return _get_singleshot(filepath)
     else:
-        port = 42519
         df = zmq_get(port, host, 'get dataframe', timeout)
         try:
             padding = ('',)*(df.columns.nlevels - 1)