Merge pull request #68 from rpanderson/master

rpanderson · web-flow · commit 5760b8a2e024 · 2020-06-16T12:07:02.000+10:00
experiment_name changed to apparatus_name
diff --git a/lyse/__main__.py b/lyse/__main__.py
@@ -2008,7 +2008,7 @@ def on_save_configuration_as_triggered(self):
             try:
                 default_path = os.path.join(self.exp_config.get('DEFAULT', 'app_saved_configs'), 'lyse')
             except LabConfig.NoOptionError:
-                self.exp_config.set('DEFAULT', 'app_saved_configs', os.path.join('%(labscript_suite)s', 'userlib', 'app_saved_configs', '%(experiment_name)s'))
+                self.exp_config.set('DEFAULT', 'app_saved_configs', os.path.join('%(labscript_suite)s', 'userlib', 'app_saved_configs', '%(apparatus_name)s'))
                 default_path = os.path.join(self.exp_config.get('DEFAULT', 'app_saved_configs'), 'lyse')
             if not os.path.exists(default_path):
                 os.makedirs(default_path)
@@ -2154,7 +2154,7 @@ def load_window_geometry_configuration(self, filename):
                 self.ui.splitter_horizontal.setSizes(save_data['splitter_horizontal'])
 
     def setup_config(self):
-        required_config_params = {"DEFAULT": ["experiment_name"],
+        required_config_params = {"DEFAULT": ["apparatus_name"],
                                   "programs": ["text_editor",
                                                "text_editor_arguments",
                                                "hdf5_viewer",
