diff --git a/scripts/Interface/reduction_gui/reduction/sans/data_cat.py b/scripts/Interface/reduction_gui/reduction/sans/data_cat.py index ba67ba72ed7a825e150c0df711183010b0db101b..929cf5448f46815f472419793d3cae9b6051de42 100644 --- a/scripts/Interface/reduction_gui/reduction/sans/data_cat.py +++ b/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() diff --git a/scripts/Interface/reduction_gui/reduction/sans/eqsans_catalog.py b/scripts/Interface/reduction_gui/reduction/sans/eqsans_catalog.py index 56378304450f961c64883b920dfff48289b48126..c6332c57b0f852f1f4393ea79e856b894e3303da 100644 --- a/scripts/Interface/reduction_gui/reduction/sans/eqsans_catalog.py +++ b/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): diff --git a/scripts/Interface/reduction_gui/reduction/sans/hfir_catalog.py b/scripts/Interface/reduction_gui/reduction/sans/hfir_catalog.py index ca456fabe4a4575ddc373d1ab6680f4c329e01ad..db32fb7a1749c4da13fa2a38295da7a2d200730a 100644 --- a/scripts/Interface/reduction_gui/reduction/sans/hfir_catalog.py +++ b/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):