diff --git a/hexrdgui/calibration/calibration_dialog.py b/hexrdgui/calibration/calibration_dialog.py index a6e9cb193..615f636f4 100644 --- a/hexrdgui/calibration/calibration_dialog.py +++ b/hexrdgui/calibration/calibration_dialog.py @@ -551,7 +551,12 @@ def mirror_constraints_from_first_detector(self): for transform, transform_vary in statuses.items(): det_transform = detector['transform'][transform] for k, v in transform_vary.items(): - det_transform[k]['_param'].vary = v + param = det_transform[k]['_param'] + if param.expr is not None: + # Skip over expression parameters + continue + + param.vary = v det_transform[k]['_vary'] = v if self.delta_boundaries: @@ -559,7 +564,8 @@ def mirror_constraints_from_first_detector(self): for transform, delta_dict in deltas.items(): det_transform = detector['transform'][transform] for k, v in delta_dict.items(): - det_transform[k]['_param'].delta = v + param = det_transform[k]['_param'] + param.delta = v det_transform[k]['_delta'] = v self.tree_view.reset_gui() diff --git a/hexrdgui/main_window.py b/hexrdgui/main_window.py index 2dceba048..d976a6b8a 100644 --- a/hexrdgui/main_window.py +++ b/hexrdgui/main_window.py @@ -1641,7 +1641,7 @@ def on_action_open_preconfigured_instrument_file_triggered(self): aliases = { 'dcs.yml': 'DCS', 'dual_dexelas.yml': 'Dual Dexelas', - 'rigaku.yml': 'Rigaku', + 'rigaku.hexrd': 'Rigaku', 'varex.yml': 'Varex', } diff --git a/hexrdgui/resources/ui/llnl_import_tool_dialog.ui b/hexrdgui/resources/ui/llnl_import_tool_dialog.ui index ab4ce1f1d..4855888b5 100644 --- a/hexrdgui/resources/ui/llnl_import_tool_dialog.ui +++ b/hexrdgui/resources/ui/llnl_import_tool_dialog.ui @@ -301,9 +301,6 @@ - - false - Add Transform @@ -318,9 +315,6 @@ - - false - None