-
Notifications
You must be signed in to change notification settings - Fork 5
Load NXdata auxiliary signals with distinct dimensions #306
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.
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
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -110,6 +110,10 @@ def _init_field_dims(self, name: str, field: Field | Group) -> None: | |
| # len(dims). | ||
| shape = _squeeze_trailing(dims, field.dataset.shape) | ||
| field.sizes = dict(zip(dims, shape, strict=False)) | ||
| elif name in self._aux_signals: | ||
| # Auxiliary signals are allowed to have dimensions unrelated to the | ||
| # primary signal. Keep the field's fallback dimensions in that case. | ||
| return | ||
| elif self._valid: | ||
| s1 = self._signal.sizes | ||
| s2 = field.sizes | ||
|
|
@@ -376,7 +380,13 @@ def _assemble_as_data( | |
| signals = {self._signal_name: da} | ||
| signals.update(aux) | ||
| if all(isinstance(v, sc.Variable | sc.DataArray) for v in signals.values()): | ||
| return sc.Dataset(signals) | ||
| try: | ||
| return sc.Dataset(signals) | ||
| except sc.DimensionError: | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Catching |
||
| # A Dataset requires matching item dimensionality. NeXus permits | ||
| # auxiliary signals on unrelated dimensions, so retain those as | ||
| # separate DataGroup entries instead. | ||
| pass | ||
| return sc.DataGroup(signals) | ||
| return da | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -276,6 +276,26 @@ def test_auxiliary_signal_causes_load_as_dataset(h5root) -> None: | |
| assert_identical(data[...], sc.Dataset({'signal': signal, 'xx': aux})) | ||
|
|
||
|
|
||
| def test_auxiliary_signal_with_different_dims_loads_as_data_group(h5root) -> None: | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This covers a bare
|
||
| signal = sc.array(dims=['tof'], unit='counts', values=[1, 2, 3]) | ||
| frame_total = sc.array(dims=['frame'], unit='counts', values=[4, 5]) | ||
| data = snx.create_class(h5root, 'data1', NXdata) | ||
| data.attrs['axes'] = signal.dims | ||
| data.attrs['signal'] = 'signal' | ||
| data.attrs['auxiliary_signals'] = ['frame_total'] | ||
| snx.create_field(data, 'signal', signal) | ||
| snx.create_field(data, 'frame_total', frame_total) | ||
|
|
||
| loaded = snx.Group(data, definitions=snx.base_definitions())[...] | ||
|
|
||
| assert isinstance(loaded, sc.DataGroup) | ||
| assert_identical(loaded['signal'], sc.DataArray(signal)) | ||
| assert_identical( | ||
| loaded['frame_total'], | ||
| sc.array(dims=['dim_0'], unit='counts', values=[4, 5]), | ||
| ) | ||
|
|
||
|
|
||
| def test_NXlog_data_is_loaded_as_time_dependent_data_array(nxroot) -> None: | ||
| da = sc.DataArray( | ||
| data=sc.array(dims=['time'], unit='K', values=[1, 2, 3]), | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Skipping the consistency check means the auxiliary signal keeps a generated dim label such as
dim_0, andNXdata.sizesmerges these into the group sizes. This can silently collide with the signal's dims. Example: signal withaxes=['.'](so its dim isdim_0, length 3) andframe_totalwith length 2:group.sizesreports{'dim_0': 2}group['dim_0', 2]raisesIndexError, although it is a valid index for the signalgroup['dim_0', 1]slices signal andframe_totalwith the same index, returning wrong dataOn
mainthis file is rejected with a fallback warning, which is the safer outcome.