Skip to content
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

Use enumerations for the absorption edge and emission lines #4

Open
wants to merge 2 commits into
base: improve_nxelectron_level
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
53 changes: 42 additions & 11 deletions applications/NXxas_new.nxdl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -110,22 +110,53 @@
<doc>Excited element</doc>
<field name="symbol"></field>
</group>
<group type="NXxray_level" name="absorption_edge">
<doc>Excited electron level</doc>
<field name="name"></field>
</group>
<field name="emission_line" type="NX_CHAR" optional="true">
<field name="absorption_edge">
<doc>The X-ray absorption edge writen using the IUPAC notation.</doc>
<enumeration>
<item value="K"></item>
<item value="L1"></item>
<item value="L2"></item>
<item value="L3"></item>
<item value="M1"></item>
<item value="M2"></item>
<item value="M3"></item>
<item value="M4"></item>
<item value="M5"></item>
<item value="N1"></item>
<item value="N2"></item>
<item value="N3"></item>
<item value="N4"></item>
<item value="N5"></item>
<item value="N6"></item>
<item value="N7"></item>
<item value="O1"></item>
<item value="O2"></item>
<item value="O3"></item>
<item value="P1"></item>
<item value="P2"></item>
<item value="P3"></item>
</enumeration>
</field>
<field name="emission_lines" type="NX_CHAR" optional="true">
<doc>
Emission lines relevant when :ref:`mode &lt;/NXxas_new/ENTRY/mode-field&gt;` is
`fluorescence yield` or `herfd`.

The emission lines are described as a list of names of the form
*"INITIAL-FINAL"* where *INITAL* and *FINAL* are electron levels
as listed for :ref:`here &lt;/NXxray_level/name-field&gt;`.
The emission lines are writen using the IUPAC notation, i.e. an
initial and final edge seprated by a hyphen.

TODO: Extend the enumeration to include all possible emission lines.
</doc>
<dimensions rank="1">
<dim index="1" value="nTransitions"/>
</dimensions>
<enumeration>
<item value="K-L1"></item>
<item value="K-L2"></item>
<item value="K-L3"></item>
<item value="K-M1"></item>
<item value="K-M2"></item>
<item value="K-M3"></item>
<item value="K-M4"></item>
<item value="K-M5"></item>
</enumeration>
</field>
<field name="energy" type="NX_FLOAT" units="NX_ENERGY">
<doc>TODO</doc>
Expand Down
90 changes: 0 additions & 90 deletions base_classes/NXxray_level.nxdl.xml

This file was deleted.