Backport PR #1335

Squashed commits
daff185
9b6714f
ab4ed0a
5a87565
6555ace
549189c

docs/release_notes/2.3.rst

@@ -92,3 +92,9 @@ Developer Changes
 - #1259 : Update license year in code files and add pre-commit check
 - #1243  #1276 : Stack selector based on datasets
 - #1184 : Make more use of QTest in gui testing
+
+
+2.3.1
+-----
+
+- #1332 : Load dataset dialog wont accept non standard names

mantidimaging/gui/windows/load_dialog/presenter.py

@@ -123,7 +123,11 @@ def do_update_flat_or_dark(self, field: Field, name: str, suffix: str):
         if not selected_file:
             return
         selected_dir = Path(os.path.dirname(selected_file))
-        field.set_images(find_images(selected_dir, name, suffix, image_format=self.image_format, logger=logger))
+        images = find_images(selected_dir, name, suffix, image_format=self.image_format, logger=logger)
+        if not images:
+            base_name = os.path.basename(selected_file).rpartition("_")[0]
+            images = find_images(selected_dir, base_name, "", image_format=self.image_format, logger=logger)
+        field.set_images(images)
 
     def get_parameters(self) -> LoadingParameters:
         lp = LoadingParameters()

mantidimaging/gui/windows/load_dialog/test/presenter_test.py

@@ -136,6 +136,25 @@ def test_do_update_flat_or_dark(self, find_images):
         find_images.assert_called_once_with(Path('/'), name, suffix, image_format='', logger=logger)
         field.set_images.assert_called_once_with(find_images.return_value)
 
+    @mock.patch("mantidimaging.gui.windows.load_dialog.presenter.find_images")
+    def test_do_update_flat_or_dark_second_attempt(self, find_images):
+        file_name = "/aaa_0000.tiff"
+        name = "Name"
+        suffix = "Apples"
+        field = mock.MagicMock()
+        self.v.select_file.return_value = file_name
+        files_list = [file_name, "aaa_0001.tiff"]
+        find_images.side_effect = [[], files_list]
+
+        self.p.do_update_flat_or_dark(field, name, suffix)
+
+        calls = [
+            mock.call(Path('/'), name, suffix, image_format='', logger=logger),
+            mock.call(Path('/'), "aaa", "", image_format='', logger=logger)
+        ]
+        find_images.assert_has_calls(calls)
+        field.set_images.assert_called_once_with(files_list)
+
     def test_do_update_single_file(self):
         file_name = "file_name"
         name = "Name"