Skip to content

224: Fix hdf5 errors #260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
krzywon merged 6 commits into from
Nov 9, 2026
Merged

224: Fix hdf5 errors #260

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2161fce
Skip any unexpected children within the NXdata to ignore extra inform…
krzywon Nov 5, 2026
e50badc
Apply resolutions as an uncertainty to the Q data
krzywon Nov 5, 2026
f1c1ddf
Check for empty key lists for the source
krzywon Nov 5, 2026
d800bc9
Ensure resolutions are loaded in the form of dQ and not Qdev (or other)
krzywon Nov 5, 2026
8eb70c2
Include resolutions definition which was missed in a previous commit
krzywon Nov 5, 2026
0f31fec
Merge branch '253-class-importer' into 224-hdf5-errors
krzywon Nov 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion sasdata/data_io/importers/import_hdf5.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,16 @@ def connected_data(node: SASDataGroup, name_prefix="", metadata=None) -> dict[st

uncertainty_map = {}
uncertainties = set()
resolutions = set()
entries = {}

for name in node.children:
child = node.children[name]

if hasattr(child, "children"):
# Some files include other metadata that gives various reduction steps within the data - Ignore
continue

if "units" in child.attributes and child.attributes["units"]:
units = parse(child.attributes["units"])
else:
Expand All @@ -101,6 +106,9 @@ def connected_data(node: SASDataGroup, name_prefix="", metadata=None) -> dict[st
uncertainty_name = child.attributes["uncertainties"]
uncertainty_map[name] = uncertainty_name
uncertainties.add(uncertainty_name)
if "resolutions" in child.attributes:
resolutions_name = child.attributes["resolutions"]
resolutions.add(resolutions_name)

entries[name] = quantity

Expand All @@ -112,6 +120,9 @@ def connected_data(node: SASDataGroup, name_prefix="", metadata=None) -> dict[st
uncertainty = entries[uncertainty_map[name]]
new_entry = entry.with_standard_error(uncertainty)
output[name] = new_entry
elif name in resolutions and not str(name).startswith('dQ'):
# Resolutions are sometimes labeled as Qdev - set to dQ in this case
output['dQ'] = entry
else:
output[name] = entry

Expand Down Expand Up @@ -305,7 +316,7 @@ def parse_instrument(node : HDF5Group) -> Instrument:
detector = [parse_detector(node[p]) for p in keys] # Empty list of keys will give an empty collimations list

keys = find_canSAS_key(node, "SASsource")
source = parse_source(node[keys[0]]) if keys is not None else None
source = parse_source(node[keys[0]]) if keys is not None and any(keys) else None

return Instrument(
collimations=collimations,
Expand Down
Loading