From 280663b2999e34f1e4c28571a3e01efab8870a95 Mon Sep 17 00:00:00 2001 From: Jeff Krzywon Date: Tue, 3 Nov 2026 11:52:49 -0500 Subject: [PATCH 1/4] Change the data name to the metadata.title if it exists, otherwise, fall back to the entry_key value --- sasdata/data_io/importers/import_hdf5.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sasdata/data_io/importers/import_hdf5.py b/sasdata/data_io/importers/import_hdf5.py index 8c4fa5c21..800541edb 100644 --- a/sasdata/data_io/importers/import_hdf5.py +++ b/sasdata/data_io/importers/import_hdf5.py @@ -442,7 +442,7 @@ def load_data(filename: str | Path) -> dict[str, SasMeasurement]: entry_key = entry.attrs["sasview_key"] if "sasview_key" in entry.attrs else root_key loaded_data[entry_key] = SasMeasurement( - name=root_key, + name=metadata.title if metadata.title else entry_key, dataset_type=dataset_type, data_contents=data_contents, metadata=metadata, From 9640b0777de292afdf35dba42ba738a0a55e7718 Mon Sep 17 00:00:00 2001 From: Jeff Krzywon Date: Tue, 3 Nov 2026 11:54:20 -0500 Subject: [PATCH 2/4] Update the path to the test files to use the new relative path to the importers --- sasdata/data_io/importers/import_hdf5.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sasdata/data_io/importers/import_hdf5.py b/sasdata/data_io/importers/import_hdf5.py index 800541edb..373ebde17 100644 --- a/sasdata/data_io/importers/import_hdf5.py +++ b/sasdata/data_io/importers/import_hdf5.py @@ -29,12 +29,12 @@ from sasdata.quantities.quantity import NamedQuantity, Quantity from sasdata.quantities.unit_parser import parse -# test_file = "./example_data/1d_data/33837rear_1D_1.75_16.5_NXcanSAS_v3.h5" -# test_file = "./example_data/1d_data/33837rear_1D_1.75_16.5_NXcanSAS.h5" -test_file = "./example_data/2d_data/BAM_2D.h5" -# test_file = "./example_data/2d_data/14250_2D_NoDetInfo_NXcanSAS_v3.h5" -# test_file = "./example_data/2d_data/33837rear_2D_1.75_16.5_NXcanSAS_v3.h5" -test_file = "./test/sasdataloader/data/nxcansas_1Dand2D_multisasdata.h5" +# test_file = "../example_data/1d_data/33837rear_1D_1.75_16.5_NXcanSAS_v3.h5" +# test_file = "../example_data/1d_data/33837rear_1D_1.75_16.5_NXcanSAS.h5" +test_file = "../../../sasdata/example_data/2d_data/BAM_2D.h5" +# test_file = "../example_data/2d_data/14250_2D_NoDetInfo_NXcanSAS_v3.h5" +# test_file = "../example_data/2d_data/33837rear_2D_1.75_16.5_NXcanSAS_v3.h5" +#test_file = "../../../test/test_files/data/nxcansas_1Dand2D_multisasdata.h5" logger = logging.getLogger(__name__) From 7ae74d880dccd2ce99965070204c323283313df3 Mon Sep 17 00:00:00 2001 From: Jeff Krzywon Date: Tue, 3 Nov 2026 12:08:05 -0500 Subject: [PATCH 3/4] Update the structured text files to match the new expected outputs of using for HDF5 files --- test/test_files/reference/MAR07232_rest.txt | 2 +- test/test_files/reference/nxcansas_1Dand2D_multisasdata.txt | 2 +- test/test_files/reference/nxcansas_1Dand2D_multisasentry.txt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/test_files/reference/MAR07232_rest.txt b/test/test_files/reference/MAR07232_rest.txt index 1cf6ab802..796b1f64a 100644 --- a/test/test_files/reference/MAR07232_rest.txt +++ b/test/test_files/reference/MAR07232_rest.txt @@ -1,4 +1,4 @@ -sasentry01 +MAR07232_rest_out.dat Qy Qx I diff --git a/test/test_files/reference/nxcansas_1Dand2D_multisasdata.txt b/test/test_files/reference/nxcansas_1Dand2D_multisasdata.txt index 820609c94..91785e170 100644 --- a/test/test_files/reference/nxcansas_1Dand2D_multisasdata.txt +++ b/test/test_files/reference/nxcansas_1Dand2D_multisasdata.txt @@ -1,4 +1,4 @@ -sasentry01 +MH4_5deg_16T_SLOW Qy Qx I diff --git a/test/test_files/reference/nxcansas_1Dand2D_multisasentry.txt b/test/test_files/reference/nxcansas_1Dand2D_multisasentry.txt index a40fb7bbd..82bdd9b1b 100644 --- a/test/test_files/reference/nxcansas_1Dand2D_multisasentry.txt +++ b/test/test_files/reference/nxcansas_1Dand2D_multisasentry.txt @@ -1,4 +1,4 @@ -sasentry01 +MH4_5deg_16T_SLOW dQ Q I @@ -45,7 +45,7 @@ Source: Max. Wavelength: None Wavelength spread: None Beam size: None -sasentry02 +MH4_5deg_16T_SLOW Qy Qx I From 10f92b0b2ae40dca3910de80b69340fa586bf707 Mon Sep 17 00:00:00 2001 From: Jeff Krzywon Date: Thu, 5 Nov 2026 03:17:19 -0500 Subject: [PATCH 4/4] ruff fix --- test/quantities/utest_units.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/quantities/utest_units.py b/test/quantities/utest_units.py index 3405d7ae8..c0d11b81a 100644 --- a/test/quantities/utest_units.py +++ b/test/quantities/utest_units.py @@ -2,8 +2,6 @@ import pytest -import pytest - import sasdata.quantities.units as units from sasdata.quantities.units import UnknownUnit