From c4c75d4210ea9e5e00d76bcbe52ff3ccddb6c8e2 Mon Sep 17 00:00:00 2001
From: Joseph Ramsay <joseph.ramsay@stfc.ac.uk>
Date: Wed, 13 Jun 2018 09:29:49 +0100
Subject: [PATCH] Re #22456 Split mode specific variables into separate
dictionaries
---
.../gem_routines/gem_advanced_config.py | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/scripts/Diffraction/isis_powder/gem_routines/gem_advanced_config.py b/scripts/Diffraction/isis_powder/gem_routines/gem_advanced_config.py
index 808da188016..769a710b001 100644
--- a/scripts/Diffraction/isis_powder/gem_routines/gem_advanced_config.py
+++ b/scripts/Diffraction/isis_powder/gem_routines/gem_advanced_config.py
@@ -95,11 +95,16 @@ all_adv_variables = {
def get_mode_specific_variables(is_texture_mode):
- return {"focused_cropping_values": texture_focused_cropping_values if is_texture_mode else focused_cropping_values,
- "vanadium_cropping_values": texture_vanadium_cropping_values if is_texture_mode
- else vanadium_cropping_values,
- "grouping_file_name": "offsets_xie_test_2.cal" if is_texture_mode else "GEM_Instrument_grouping.cal",
- "save_maud": is_texture_mode}
+ if is_texture_mode:
+ return {"focused_cropping_values": texture_focused_cropping_values,
+ "vanadium_cropping_values": texture_vanadium_cropping_values,
+ "grouping_file_name": "offsets_xie_test_2.cal",
+ "save_maud": True}
+ else:
+ return {"focused_cropping_values": focused_cropping_values,
+ "vanadium_cropping_values": vanadium_cropping_values,
+ "grouping_file_name": "GEM_Instrument_grouping.cal",
+ "save_maud": False}
def get_all_adv_variables():
--
GitLab