From 406b7422454d8143dc0e0ebcedd2b9c83e37f272 Mon Sep 17 00:00:00 2001 From: woutdenolf Date: Wed, 12 Mar 2025 18:33:02 +0100 Subject: [PATCH 1/3] omitting AXISNAME_indices can only be unambiguous in the case of 1D axes --- base_classes/NXdata.nxdl.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base_classes/NXdata.nxdl.xml b/base_classes/NXdata.nxdl.xml index 991adf0a3d..3e3954018c 100644 --- a/base_classes/NXdata.nxdl.xml +++ b/base_classes/NXdata.nxdl.xml @@ -141,8 +141,8 @@ field name in the :ref:`axes </NXdata@axes-attribute>` attribute are used. 4. When :ref:`AXISNAME_indices </NXdata@AXISNAME_indices-attribute>` is the same as the indices of "AXISNAME" in the - :ref:`axes </NXdata@axes-attribute>` attribute, there is no need to provide - :ref:`AXISNAME_indices </NXdata@AXISNAME_indices-attribute>`. + :ref:`axes </NXdata@axes-attribute>` attribute and :ref:`AXISNAME </NXdata/AXISNAME-field>` is one-dimensional, + the :ref:`AXISNAME_indices </NXdata@AXISNAME_indices-attribute>` attribute can be omitted. 5. The indices of "AXISNAME" in the :ref:`axes </NXdata@axes-attribute>` attribute must be a subset of :ref:`AXISNAME_indices </NXdata@AXISNAME_indices-attribute>`. From 975c349bcb8f3f6f46603fa7109a69872bbf6282 Mon Sep 17 00:00:00 2001 From: woutdenolf Date: Wed, 12 Mar 2025 18:41:13 +0100 Subject: [PATCH 2/3] make clear that 3- or higher-dimensions are allowed for data and axes --- base_classes/NXdata.nxdl.xml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/base_classes/NXdata.nxdl.xml b/base_classes/NXdata.nxdl.xml index 3e3954018c..1235f0bf0a 100644 --- a/base_classes/NXdata.nxdl.xml +++ b/base_classes/NXdata.nxdl.xml @@ -75,11 +75,12 @@ More complex cases are supported - * histogram data: ``x`` has one more value than ``data``. - * alternative axes: instead of a single ``x`` axis you can have several axes, one of which being the default. - * signals with more than one dimension: ``data`` could be 2D with axes ``x`` and ``y`` along each dimension. - * axes with more than one dimension: ``data`` could be 2D with axes ``x`` and ``y`` also being 2D, providing a - unique ``(x, y)`` coordinate for each ``data`` point. + * Histogram data. For example ``x`` has one more value than ``data``. + * Alternative axes. For example instead of a single ``x`` axis you can have several axes, one of which being the default. + * Signals with more than one dimension. For example ``data`` could be 2D with axes ``x`` and ``y`` along each dimension. + Equivalently 3- or higher-dimensional data is allowed. + * Axes with more than one dimension. For example ``data`` could be 2D with axes ``x`` and ``y`` also being 2D, providing a + unique ``(x, y)`` coordinate for each ``data`` point. Equivalently 3- or higher-dimensional axes are allowed. **Signals:** From a778dfe9f63e68a17c8b7177c6f100fb7901d190 Mon Sep 17 00:00:00 2001 From: woutdenolf Date: Tue, 18 Mar 2025 18:12:58 +0100 Subject: [PATCH 3/3] use "equally" instead of "equivalently" --- base_classes/NXdata.nxdl.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base_classes/NXdata.nxdl.xml b/base_classes/NXdata.nxdl.xml index 1235f0bf0a..a7b363ef37 100644 --- a/base_classes/NXdata.nxdl.xml +++ b/base_classes/NXdata.nxdl.xml @@ -78,9 +78,9 @@ * Histogram data. For example ``x`` has one more value than ``data``. * Alternative axes. For example instead of a single ``x`` axis you can have several axes, one of which being the default. * Signals with more than one dimension. For example ``data`` could be 2D with axes ``x`` and ``y`` along each dimension. - Equivalently 3- or higher-dimensional data is allowed. + Equally 3- or higher-dimensional data is allowed. * Axes with more than one dimension. For example ``data`` could be 2D with axes ``x`` and ``y`` also being 2D, providing a - unique ``(x, y)`` coordinate for each ``data`` point. Equivalently 3- or higher-dimensional axes are allowed. + unique ``(x, y)`` coordinate for each ``data`` point. Equally 3- or higher-dimensional axes are allowed. **Signals:**