Skip to content

Fixes in NXmpes #361

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
lukaspie merged 4 commits into from
Mar 20, 2025
Merged

Fixes in NXmpes #361

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9e29f6a
enumeration fix in NXmpes
lukaspie Mar 17, 2025
5942f7c
make NXparameters/TERM an NX_NUMBER
lukaspie Mar 18, 2025
ca14344
add NXresolution to NXmpes/NXinstrument again
lukaspie Mar 19, 2025
30ea81d
make NXparameters/TERM NX_CHAR_OR_NUMBER
lukaspie Mar 20, 2025
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
2 changes: 1 addition & 1 deletion base_classes/NXparameters.nxdl.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
name="NXparameters"
type="group" extends="NXobject">
<doc>Container for parameters, usually used in processing or analysis.</doc>
<field name="TERM" minOccurs="0" maxOccurs="unbounded" nameType="any">
<field name="TERM" nameType="any" type="NX_NUMBER" units="NX_ANY" minOccurs="0" maxOccurs="unbounded">
<!-- maxOccurs="unbounded" is intended but is not allowed by current syntax -->
<doc>A parameter (also known as a term) that is used in or results from processing.</doc>
<attribute name="units"/>
Expand Down
9 changes: 5 additions & 4 deletions base_classes/nyaml/NXparameters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,18 @@ doc: |
Container for parameters, usually used in processing or analysis.
type: group
NXparameters(NXobject):
TERM:
exists: ['min', '0', 'max', 'unbounded']
TERM(NX_NUMBER):
Comment thread
lukaspie marked this conversation as resolved.
Outdated
nameType: any
unit: NX_ANY
exists: ['min', '0', 'max', 'unbounded']

# maxOccurs="unbounded" is intended but is not allowed by current syntax
doc: |
A parameter (also known as a term) that is used in or results from processing.
\@units:

# ++++++++++++++++++++++++++++++++++ SHA HASH ++++++++++++++++++++++++++++++++++
# 39767f24c386bbbf096fdae88c54eb252d7cc61251b070c2c37bc769960216c1
# a0f0096ed5dd998f41add75e217b1db76f03084d88291fb4a54625f9e6622379
# <?xml version="1.0" encoding="UTF-8"?>
# <?xml-stylesheet type="text/xsl" href="nxdlformat.xsl" ?>
# <!--
Expand Down Expand Up @@ -43,7 +44,7 @@ NXparameters(NXobject):
# name="NXparameters"
# type="group" extends="NXobject">
# <doc>Container for parameters, usually used in processing or analysis.</doc>
# <field name="TERM" minOccurs="0" maxOccurs="unbounded" nameType="any">
# <field name="TERM" nameType="any" type="NX_NUMBER" units="NX_ANY" minOccurs="0" maxOccurs="unbounded">
# <!-- maxOccurs="unbounded" is intended but is not allowed by current syntax -->
# <doc>A parameter (also known as a term) that is used in or results from processing.</doc>
# <attribute name="units"/>
Expand Down
8 changes: 7 additions & 1 deletion contributed_definitions/NXmpes.nxdl.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,12 @@
</doc>
</field>
</group>
<group type="NXresolution" optional="true">
<doc>
Any further resolution information about the instrument. For example, the angular
resolution of the instrument if the spectrometer is angle-resolving.
</doc>
</group>
<group name="device_information" type="NXfabrication" recommended="true">
<field name="vendor" recommended="true"/>
<field name="model" recommended="true"/>
Expand Down Expand Up @@ -1022,7 +1028,7 @@
</attribute>
<attribute name="axes">
<enumeration>
<item value="kinetic_energy"/>
<item value="['kinetic_energy']"/>
</enumeration>
</attribute>
<field name="kinetic_energy" type="NX_FLOAT" units="NX_ENERGY">
Expand Down
17 changes: 14 additions & 3 deletions contributed_definitions/nyaml/NXmpes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -946,7 +951,7 @@ NXmpes(NXobject):
\@signal:
enumeration: [relative_intensity]
\@axes:
enumeration: [kinetic_energy]
enumeration: [['kinetic_energy']]
kinetic_energy(NX_FLOAT):
unit: NX_ENERGY
doc: |
Expand Down Expand Up @@ -1342,7 +1347,7 @@ NXmpes(NXobject):
/entry/sample/temperature_env/temperature_sensor/value.

# ++++++++++++++++++++++++++++++++++ SHA HASH ++++++++++++++++++++++++++++++++++
# 42c16f3b18f5cbb48055a823da46ddada90200db6ea2bca9fe97b2fb6aec815d
# 487933937d4e3cb272f8b41a8b9fae3427a741b986f5574de6beb3566a612c23
# <?xml version='1.0' encoding='UTF-8'?>
# <?xml-stylesheet type="text/xsl" href="nxdlformat.xsl"?>
# <!--
Expand Down Expand Up @@ -1560,6 +1565,12 @@ NXmpes(NXobject):
# </doc>
# </field>
# </group>
# <group type="NXresolution" optional="true">
# <doc>
# Any further resolution information about the instrument. For example, the angular
# resolution of the instrument if the spectrometer is angle-resolving.
# </doc>
# </group>
# <group name="device_information" type="NXfabrication" recommended="true">
# <field name="vendor" recommended="true"/>
# <field name="model" recommended="true"/>
Expand Down Expand Up @@ -2367,7 +2378,7 @@ NXmpes(NXobject):
# </attribute>
# <attribute name="axes">
# <enumeration>
# <item value="kinetic_energy"/>
# <item value="['kinetic_energy']"/>
# </enumeration>
# </attribute>
# <field name="kinetic_energy" type="NX_FLOAT" units="NX_ENERGY">
Expand Down