Merge with PhyNerd/ConnectionTable-exceptions (Pull request labscript-suite#45)

Author: chrisjbillington

Diff for: __main__.py

@@ -45,7 +45,7 @@
 except ImportError:
     raise ImportError('Require labscript_utils > 2.1.0')
 
-check_version('labscript_utils', '2.7.1', '3')
+check_version('labscript_utils', '2.7.2', '3')
 check_version('qtutils', '2.0.0', '3.0.0')
 check_version('zprocess', '1.1.2', '3')
 check_version('labscript_devices', '2.0', '3')
@@ -697,7 +697,7 @@ def process(self,h5_filepath):
     # Create Connection Table object
     logger.info('About to load connection table: %s'%exp_config.get('paths','connection_table_h5'))
     connection_table_h5_file = exp_config.get('paths','connection_table_h5')
-    connection_table = ConnectionTable(connection_table_h5_file, logging_prefix='BLACS')
+    connection_table = ConnectionTable(connection_table_h5_file, logging_prefix='BLACS', exceptions_in_thread=True)
 
     logger.info('connection table loaded')
 

Diff for: front_panel_settings.py

@@ -76,7 +76,7 @@ def restore(self):
         error = {}
         tab_data = {'BLACS settings':{}}
         try:
-            saved_ct = ConnectionTable(self.settings_path, logging_prefix='BLACS')
+            saved_ct = ConnectionTable(self.settings_path, logging_prefix='BLACS', exceptions_in_thread=True)
             ct_match,error = self.connection_table.compare_to(saved_ct)
 
             with h5py.File(self.settings_path,'r') as hdf5_file: