diff --git a/scripts/Diffraction/isis_powder/routines/common.py b/scripts/Diffraction/isis_powder/routines/common.py
index a1344ace85657496c6b5b44a7df3372a58d288e4..b91da6e3b312392bca91a874b1db515391684172 100644
--- a/scripts/Diffraction/isis_powder/routines/common.py
+++ b/scripts/Diffraction/isis_powder/routines/common.py
@@ -1,4 +1,5 @@
from __future__ import (absolute_import, division, print_function)
+from six import iterkeys
import mantid.kernel as kernel
import mantid.simpleapi as mantid
@@ -11,7 +12,7 @@ def cal_map_dictionary_key_helper(dictionary, key, append_to_error_message=None)
message stating the following key could not be found in the calibration mapping file. As
several instruments will use this message it makes sense to localise it to common. If a
message is passed in append_to_error_message it will append that to the end of the generic
- error message in its own line when an exception is raised.
+ error message in its own line when an exception is raised. This lookup is case insensitive.
:param dictionary: The dictionary to search in for the key
:param key: The key to search for
:param append_to_error_message: (Optional) The message to append to the end of the error message
@@ -19,7 +20,9 @@ def cal_map_dictionary_key_helper(dictionary, key, append_to_error_message=None)
"""
err_message = "The field '" + str(key) + "' is required within the calibration file but was not found."
err_message += '\n' + str(append_to_error_message) if append_to_error_message else ''
- return dictionary_key_helper(dictionary=dictionary, key=key, throws=True, exception_msg=err_message)
+
+ return dictionary_key_helper(dictionary=dictionary, key=key, throws=True,
+ case_insensitive=True, exception_msg=err_message)
def crop_banks_using_crop_list(bank_list, crop_values_list):
@@ -67,7 +70,7 @@ def crop_in_tof(ws_to_crop, x_min=None, x_max=None):
return cropped_ws
-def dictionary_key_helper(dictionary, key, throws=True, exception_msg=None):
+def dictionary_key_helper(dictionary, key, throws=True, case_insensitive=False, exception_msg=None):
"""
Checks if the key is in the dictionary and performs various different actions if it is not depending on
the user parameters. If set to not throw it will return none. Otherwise it will throw a custom user message
@@ -75,12 +78,25 @@ def dictionary_key_helper(dictionary, key, throws=True, exception_msg=None):
:param dictionary: The dictionary to search for the key
:param key: The key to search for in the dictionary
:param throws: (Optional) Defaults to true, whether this should throw on a key not being present
+ :param case_insensitive (Optional) Defaults to false, if set to true it accounts for mixed case but is O(n) time
:param exception_msg: (Optional) The error message to print in the KeyError instead of the default Python message
:return: The key if it was found, None if throws was set to false and the key was not found.
"""
if key in dictionary:
+ # Try to use hashing first
return dictionary[key]
- elif not throws:
+
+ # If we still couldn't find it use the O(n) method
+ if case_insensitive:
+ # Convert key to str
+ lower_key = str(key).lower()
+ for dict_key in iterkeys(dictionary):
+ if str(dict_key).lower() == lower_key:
+ # Found it
+ return dictionary[dict_key]
+
+ # It doesn't exist at this point lets go into our error handling
+ if not throws:
return None
elif exception_msg:
# Print user specified message
diff --git a/scripts/test/ISISPowderCommonTest.py b/scripts/test/ISISPowderCommonTest.py
index f269edbf864d27f86367354c84a20898efae4256..ab7fb70a435018833d31930e1de8a51f45ab8e6f 100644
--- a/scripts/test/ISISPowderCommonTest.py
+++ b/scripts/test/ISISPowderCommonTest.py
@@ -13,7 +13,8 @@ class ISISPowderCommonTest(unittest.TestCase):
def test_cal_map_dict_helper(self):
missing_key_name = "wrong_key"
correct_key_name = "right_key"
- dict_with_key = {correct_key_name: 123}
+ expected_val = 123
+ dict_with_key = {correct_key_name: expected_val}
# Check it correctly raises
with assertRaisesRegex(self, KeyError, "The field '" + missing_key_name + "' is required"):
@@ -26,7 +27,19 @@ class ISISPowderCommonTest(unittest.TestCase):
append_to_error_message=appended_e_msg)
# Check that it correctly returns the key value where it exists
- self.assertEqual(common.cal_map_dictionary_key_helper(dictionary=dict_with_key, key=correct_key_name), 123)
+ self.assertEqual(common.cal_map_dictionary_key_helper(dictionary=dict_with_key, key=correct_key_name),
+ expected_val)
+
+ # Check it is not case sensitive
+ different_case_name = "tEsT_key"
+ dict_with_mixed_key = {different_case_name: expected_val}
+
+ try:
+ self.assertEqual(common.cal_map_dictionary_key_helper(dictionary=dict_with_mixed_key,
+ key=different_case_name.lower()), expected_val)
+ except KeyError:
+ # It tried to use the key without accounting for the case difference
+ self.fail("cal_map_dictionary_key_helper attempted to use a key without accounting for case")
def test_crop_banks_using_crop_list(self):
bank_list = []
@@ -123,6 +136,28 @@ class ISISPowderCommonTest(unittest.TestCase):
self.assertEqual(common.dictionary_key_helper(dictionary=test_dictionary, key=good_key_name), 123)
+ def test_dictionary_key_helper_handles_mixed_case(self):
+ mixed_case_name = "tEsT_KeY"
+ lower_case_name = mixed_case_name.lower()
+ expected_val = 456
+
+ mixed_case_dict = {mixed_case_name: expected_val}
+
+ # Check by default it doesn't try to account for key
+ with self.assertRaises(KeyError):
+ common.dictionary_key_helper(dictionary=mixed_case_dict, key=lower_case_name)
+
+ # Next check if we have the flag set to False it still throws
+ with self.assertRaises(KeyError):
+ common.dictionary_key_helper(dictionary=mixed_case_dict, key=lower_case_name, case_insensitive=False)
+
+ # Check we actually get the key when we do ask for case insensitive checks
+ try:
+ val = common.dictionary_key_helper(dictionary=mixed_case_dict, key=lower_case_name, case_insensitive=True)
+ self.assertEqual(val, expected_val)
+ except KeyError:
+ self.fail("dictionary_key_helper did not perform case insensitive lookup")
+
def test_extract_ws_spectra(self):
number_of_expected_banks = 5
ws_to_split = mantid.CreateSampleWorkspace(XMin=0, XMax=1, BankPixelWidth=1,