Merge pull request #20189 from mantidproject/20185_eqsans_file_extension

Extension is now a list of accepted formats

scripts/Interface/reduction_gui/reduction/sans/data_cat.py

@@ -177,7 +177,7 @@ class DataCatalog(object):
     """
         Data catalog
     """
-    extension = "nxs"
+    extension = ["nxs"]
     data_set_cls = DataSet
 
     def __init__(self, replace_db=True):
@@ -275,22 +275,22 @@ class DataCatalog(object):
 
         try:
             for f in os.listdir(data_dir):
-                if f.endswith(self.extension):
-                    file_path = os.path.join(data_dir, f)
-
-                    if hasattr(self.data_set_cls, "find_with_api"):
-                        d = self.data_set_cls.find_with_api(file_path, c,
-                                                            process_files=process_files)
-                    else:
-                        d = self.data_set_cls.find(file_path, c,
-                                                   process_files=process_files)
-                    if d is not None:
-                        if call_back is not None:
-                            attr_list = d.as_string_list()
-                            type_id = self.data_set_cls.data_type_cls.get_likely_type(d.id, c)
-                            attr_list += (type_id,)
-                            call_back(attr_list)
-                        self.catalog.append(d)
+                for extension in self.extension:
+                    if f.endswith(extension):
+                        file_path = os.path.join(data_dir, f)
+                        if hasattr(self.data_set_cls, "find_with_api"):
+                            d = self.data_set_cls.find_with_api(file_path, c,
+                                                                process_files=process_files)
+                        else:
+                            d = self.data_set_cls.find(file_path, c,
+                                                       process_files=process_files)
+                        if d is not None:
+                            if call_back is not None:
+                                attr_list = d.as_string_list()
+                                type_id = self.data_set_cls.data_type_cls.get_likely_type(d.id, c)
+                                attr_list += (type_id,)
+                                call_back(attr_list)
+                            self.catalog.append(d)
 
             self.db.commit()
             c.close()

scripts/Interface/reduction_gui/reduction/sans/eqsans_catalog.py

@@ -52,9 +52,12 @@ class EQSANSDataSet(DataSet):
     def handle(cls, file_path):
         """
             Return a DB handle for the given file, such as a run number
+            This will handle file formats in two formats:
+            EQSANS_([0-9]+)_event
+            EQSANS_([0-9]+).nxs
         """
         file_path = file_path.strip()
-        r_re = re.search("EQSANS_([0-9]+)_event", file_path)
+        r_re = re.search("EQSANS_([0-9]+)(_event|\.nxs)", file_path)
         if r_re is not None:
             return r_re.group(1)
         else:
@@ -112,7 +115,7 @@ class EQSANSDataSet(DataSet):
 
 
 class DataCatalog(BaseCatalog):
-    extension = "nxs"
+    extension = ["nxs", "nxs.h5"]
     data_set_cls = EQSANSDataSet
 
     def __init__(self, replace_db=False):

scripts/Interface/reduction_gui/reduction/sans/hfir_catalog.py

@@ -94,7 +94,7 @@ class HFIRDataSet(DataSet):
 
 
 class DataCatalog(BaseCatalog):
-    extension = "xml"
+    extension = ["xml"]
     data_set_cls = HFIRDataSet
 
     def __init__(self, replace_db=False):