Skip to content

Commit

Permalink
fix duplicated in reference attribute
Browse files Browse the repository at this point in the history
  • Loading branch information
lukaspie authored and domna committed Jul 15, 2024
1 parent 653dd26 commit 6db20ea
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 14 deletions.
14 changes: 11 additions & 3 deletions contributed_definitions/NXdata_mpes.nxdl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@
<doc>
Calibrated energy axis.

In an application definition, this could be a link to either
/entry/process/energy_calibration/calibrated_axis or
/entry/process/energy_correction/calibrated_axis.
Could be linked from the respective '@reference' field.
</doc>
<attribute name="type" type="NX_CHAR">
<doc>
Expand All @@ -62,6 +60,16 @@
</item>
</enumeration>
</attribute>
<attribute name="reference">
<doc>
The energy can be dispersed according to different strategies. ``@reference`` points to
the path of a field defining the calibrated axis which the ``energy`` axis refers.

For example:
@reference: 'entry/process/energy_calibration/calibrated_axis'
@reference: 'entry/process/energy_referencing/calibrated_axis'
</doc>
</attribute>
</field>
<field name="kN" type="NX_NUMBER" units="NX_WAVENUMBER">
<doc>
Expand Down
1 change: 0 additions & 1 deletion contributed_definitions/NXmpes.nxdl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -908,7 +908,6 @@

For example:
@reference: 'entry/process/energy_calibration/calibrated_axis'
@reference: 'entry/process/energy_calibration/calibrated_axis'
</doc>
</attribute>
</field>
Expand Down
28 changes: 21 additions & 7 deletions contributed_definitions/nyaml/NXdata_mpes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ NXdata_mpes(NXdata):
doc: |
Calibrated energy axis.
In an application definition, this could be a link to either
/entry/process/energy_calibration/calibrated_axis or
/entry/process/energy_correction/calibrated_axis.
Could be linked from the respective '@reference' field.
\@type:
type: NX_CHAR
doc: |
Expand All @@ -40,6 +38,14 @@ NXdata_mpes(NXdata):
spec: ISO 18115-1:2023
term: 12.16
url: https://www.iso.org/obp/ui/en/#iso:std:iso:18115:-1:ed-3:v1:en:term:12.16
\@reference:
doc: |
The energy can be dispersed according to different strategies. ``@reference`` points to
the path of a field defining the calibrated axis which the ``energy`` axis refers.
For example:
@reference: 'entry/process/energy_calibration/calibrated_axis'
@reference: 'entry/process/energy_referencing/calibrated_axis'
kN(NX_NUMBER):
unit: NX_WAVENUMBER
doc: |
Expand Down Expand Up @@ -96,7 +102,7 @@ NXdata_mpes(NXdata):
/entry/instrument/beam/final_ellipticity if they exist.
# ++++++++++++++++++++++++++++++++++ SHA HASH ++++++++++++++++++++++++++++++++++
# 4b087c0544eec9b6d7a621779cae0cc23b754cbccc06a07e88f59398346cf5fe
# 573cec819375e8bb2e4895fc3869450883e1ad5d4756d4784807f3678792460d
# <?xml version='1.0' encoding='UTF-8'?>
# <?xml-stylesheet type="text/xsl" href="nxdlformat.xsl"?>
# <!--
Expand Down Expand Up @@ -132,9 +138,7 @@ NXdata_mpes(NXdata):
# <doc>
# Calibrated energy axis.
#
# In an application definition, this could be a link to either
# /entry/process/energy_calibration/calibrated_axis or
# /entry/process/energy_correction/calibrated_axis.
# Could be linked from the respective '@reference' field.
# </doc>
# <attribute name="type" type="NX_CHAR">
# <doc>
Expand All @@ -161,6 +165,16 @@ NXdata_mpes(NXdata):
# </item>
# </enumeration>
# </attribute>
# <attribute name="reference">
# <doc>
# The energy can be dispersed according to different strategies. ``@reference`` points to
# the path of a field defining the calibrated axis which the ``energy`` axis refers.
#
# For example:
# @reference: 'entry/process/energy_calibration/calibrated_axis'
# @reference: 'entry/process/energy_referencing/calibrated_axis'
# </doc>
# </attribute>
# </field>
# <field name="kN" type="NX_NUMBER" units="NX_WAVENUMBER">
# <doc>
Expand Down
4 changes: 1 addition & 3 deletions contributed_definitions/nyaml/NXmpes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -815,12 +815,11 @@ NXmpes(NXobject):
For example:
@reference: 'entry/process/energy_calibration/calibrated_axis'
@reference: 'entry/process/energy_calibration/calibrated_axis'
\@energy_indices:
exists: recommended

# ++++++++++++++++++++++++++++++++++ SHA HASH ++++++++++++++++++++++++++++++++++
# a234cd0d00b4e271886032630f3b03664c3a293da78870813433d7205d9e1607
# 42afcf3e913ccfb71ad3cf68713406ace3a757ff817a22b1cf47ad63551912ea
# <?xml version='1.0' encoding='UTF-8'?>
# <?xml-stylesheet type="text/xsl" href="nxdlformat.xsl"?>
# <!--
Expand Down Expand Up @@ -1731,7 +1730,6 @@ NXmpes(NXobject):
#
# For example:
# @reference: 'entry/process/energy_calibration/calibrated_axis'
# @reference: 'entry/process/energy_calibration/calibrated_axis'
# </doc>
# </attribute>
# </field>
Expand Down

0 comments on commit 6db20ea

Please sign in to comment.