diff --git a/sasdata/data_io/importers/import_hdf5.py b/sasdata/data_io/importers/import_hdf5.py index 8c4fa5c21..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__) @@ -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, 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