From 9e29f6ac94a89b55489f7f090a895b16e7cf3c7e Mon Sep 17 00:00:00 2001 From: Lukas Pielsticker <50139597+lukaspie@users.noreply.github.com> Date: Mon, 17 Mar 2025 18:00:39 +0100 Subject: [PATCH 1/4] enumeration fix in NXmpes --- contributed_definitions/NXmpes.nxdl.xml | 2 +- contributed_definitions/nyaml/NXmpes.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contributed_definitions/NXmpes.nxdl.xml b/contributed_definitions/NXmpes.nxdl.xml index 8b03601e98..484e3517dd 100644 --- a/contributed_definitions/NXmpes.nxdl.xml +++ b/contributed_definitions/NXmpes.nxdl.xml @@ -1022,7 +1022,7 @@ - + diff --git a/contributed_definitions/nyaml/NXmpes.yaml b/contributed_definitions/nyaml/NXmpes.yaml index 6955fc44a6..8785ec9274 100644 --- a/contributed_definitions/nyaml/NXmpes.yaml +++ b/contributed_definitions/nyaml/NXmpes.yaml @@ -946,7 +946,7 @@ NXmpes(NXobject): \@signal: enumeration: [relative_intensity] \@axes: - enumeration: [kinetic_energy] + enumeration: [['kinetic_energy']] kinetic_energy(NX_FLOAT): unit: NX_ENERGY doc: | @@ -1342,7 +1342,7 @@ NXmpes(NXobject): /entry/sample/temperature_env/temperature_sensor/value. # ++++++++++++++++++++++++++++++++++ SHA HASH ++++++++++++++++++++++++++++++++++ -# 42c16f3b18f5cbb48055a823da46ddada90200db6ea2bca9fe97b2fb6aec815d +# 1388fd6b42b8401a10c948f348791d93c5561ddc1f865cedc6f7018d2d43262f # # # A parameter (also known as a term) that is used in or results from processing. diff --git a/base_classes/nyaml/NXparameters.yaml b/base_classes/nyaml/NXparameters.yaml index f49d356a57..6bd1b4dbff 100644 --- a/base_classes/nyaml/NXparameters.yaml +++ b/base_classes/nyaml/NXparameters.yaml @@ -3,9 +3,10 @@ doc: | Container for parameters, usually used in processing or analysis. type: group NXparameters(NXobject): - TERM: - exists: ['min', '0', 'max', 'unbounded'] + TERM(NX_NUMBER): nameType: any + unit: NX_ANY + exists: ['min', '0', 'max', 'unbounded'] # maxOccurs="unbounded" is intended but is not allowed by current syntax doc: | @@ -13,7 +14,7 @@ NXparameters(NXobject): \@units: # ++++++++++++++++++++++++++++++++++ SHA HASH ++++++++++++++++++++++++++++++++++ -# 39767f24c386bbbf096fdae88c54eb252d7cc61251b070c2c37bc769960216c1 +# a0f0096ed5dd998f41add75e217b1db76f03084d88291fb4a54625f9e6622379 # # # # A parameter (also known as a term) that is used in or results from processing. # From ca143448c7648136ea0d0cafe840388ad89a4bab Mon Sep 17 00:00:00 2001 From: Lukas Pielsticker <50139597+lukaspie@users.noreply.github.com> Date: Wed, 19 Mar 2025 18:41:02 +0100 Subject: [PATCH 3/4] add NXresolution to NXmpes/NXinstrument again --- contributed_definitions/NXmpes.nxdl.xml | 6 ++++++ contributed_definitions/nyaml/NXmpes.yaml | 13 ++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/contributed_definitions/NXmpes.nxdl.xml b/contributed_definitions/NXmpes.nxdl.xml index 484e3517dd..980e4d170c 100644 --- a/contributed_definitions/NXmpes.nxdl.xml +++ b/contributed_definitions/NXmpes.nxdl.xml @@ -215,6 +215,12 @@ + + + Any further resolution information about the instrument. For example, the angular + resolution of the instrument if the spectrometer is angle-resolving. + + diff --git a/contributed_definitions/nyaml/NXmpes.yaml b/contributed_definitions/nyaml/NXmpes.yaml index 8785ec9274..841b81fb68 100644 --- a/contributed_definitions/nyaml/NXmpes.yaml +++ b/contributed_definitions/nyaml/NXmpes.yaml @@ -174,6 +174,11 @@ NXmpes(NXobject): spec: ISO 18115-1:2023 term: 10.7 ff. url: https://www.iso.org/obp/ui/en/#iso:std:iso:18115:-1:ed-3:v1:en:term:10.7 + (NXresolution): + exists: optional + doc: | + Any further resolution information about the instrument. For example, the angular + resolution of the instrument if the spectrometer is angle-resolving. device_information(NXfabrication): exists: recommended vendor: @@ -1342,7 +1347,7 @@ NXmpes(NXobject): /entry/sample/temperature_env/temperature_sensor/value. # ++++++++++++++++++++++++++++++++++ SHA HASH ++++++++++++++++++++++++++++++++++ -# 1388fd6b42b8401a10c948f348791d93c5561ddc1f865cedc6f7018d2d43262f +# 487933937d4e3cb272f8b41a8b9fae3427a741b986f5574de6beb3566a612c23 # # # A parameter (also known as a term) that is used in or results from processing. diff --git a/base_classes/nyaml/NXparameters.yaml b/base_classes/nyaml/NXparameters.yaml index 6bd1b4dbff..e608013df7 100644 --- a/base_classes/nyaml/NXparameters.yaml +++ b/base_classes/nyaml/NXparameters.yaml @@ -3,7 +3,7 @@ doc: | Container for parameters, usually used in processing or analysis. type: group NXparameters(NXobject): - TERM(NX_NUMBER): + TERM(NX_CHAR_OR_NUMBER): nameType: any unit: NX_ANY exists: ['min', '0', 'max', 'unbounded'] @@ -14,7 +14,7 @@ NXparameters(NXobject): \@units: # ++++++++++++++++++++++++++++++++++ SHA HASH ++++++++++++++++++++++++++++++++++ -# a0f0096ed5dd998f41add75e217b1db76f03084d88291fb4a54625f9e6622379 +# 6e09425dad7dc441e3e0d296a47635cdf4c85a33731c5ab4b64451705ab6556a # # # # A parameter (also known as a term) that is used in or results from processing. #