Merge with Phynerd/no_queue_data_in_run (Pull request labscript-suite#40

)
Loki27182 · Apr 11, 2018 · 5365dfa · 5365dfa
2 parents 37bf30d + f25000a
commit 5365dfa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/experiment_queue.py b/experiment_queue.py
@@ -810,7 +810,7 @@ def restart_function(device_name):
             # start new try/except block here                   
             try:
                 with h5py.File(path,'r+') as hdf5_file:
-                    self.BLACS.front_panel_settings.store_front_panel_in_h5(hdf5_file,states,tab_positions,window_data,plugin_data,save_conn_table = False)
+                    self.BLACS.front_panel_settings.store_front_panel_in_h5(hdf5_file,states,tab_positions,window_data,plugin_data,save_conn_table=False, save_queue_data=False)
 
                     data_group = hdf5_file['/'].create_group('data')
                     # stamp with the run time of the experiment

diff --git a/front_panel_settings.py b/front_panel_settings.py
@@ -337,7 +337,7 @@ def save_front_panel_to_h5(self,current_file,states,tab_positions,window_data,pl
                 self.store_front_panel_in_h5(hdf5_file,states,tab_positions,window_data,plugin_data,save_conn_table=True)
 
     @inmain_decorator(wait_for_return=True)
-    def store_front_panel_in_h5(self, hdf5_file,tab_data,notebook_data,window_data,plugin_data,save_conn_table = False):
+    def store_front_panel_in_h5(self, hdf5_file,tab_data,notebook_data,window_data,plugin_data,save_conn_table=False,save_queue_data=True):
         if save_conn_table:
             if 'connection table' in hdf5_file:
                 del hdf5_file['connection table']
@@ -396,7 +396,8 @@ def store_front_panel_in_h5(self, hdf5_file,tab_data,notebook_data,window_data,p
         dataset.attrs["window_frame_width"] = window_data["_main_window"]["frame_width"]
         dataset.attrs['plugin_data'] = repr(plugin_data)
         dataset.attrs['analysis_data'] = repr(window_data["_main_window"]["_analysis"])
-        dataset.attrs['queue_data'] = repr(window_data["_main_window"]["_queue"])
+        if save_queue_data:
+            dataset.attrs['queue_data'] = repr(window_data["_main_window"]["_queue"])
         for pane_name,pane_position in window_data.items():
             if pane_name != "_main_window":
                 dataset.attrs[pane_name] = pane_position