Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
17850c6
first refactored NXxas template
woutdenolf Feb 9, 2024
c6dc90c
improve NXelectron_level
woutdenolf Feb 11, 2024
7d26247
use X-ray level
woutdenolf Feb 13, 2024
02e43f7
add more documentation
woutdenolf Feb 13, 2024
302f4d5
Remove NXxray_level base class
mretegan May 29, 2024
68314c9
Use enumerations
mretegan May 29, 2024
44e0f73
Rename absorption_edge to edge
mretegan Nov 4, 2024
cf489f8
Remove emission_lines
mretegan Nov 4, 2024
96197ac
Modifications after the meeting
mretegan Nov 4, 2024
424a6b2
Remove unused fields
mretegan Nov 8, 2024
e9269b8
Merge pull request #4 from XraySpectroscopy/use-enumerations
mretegan Nov 8, 2024
a569c40
Add initial text for XAS absorption modes
mretegan Nov 21, 2024
3e46fe1
Added more detection modes
mretegan Nov 22, 2024
5ffe42b
List the modes in the documentation
mretegan Nov 26, 2024
a850c68
Remove empty line
mretegan Jan 20, 2025
4198517
Merge pull request #5 from XraySpectroscopy/update-xas-modes
newville Apr 24, 2025
c8ecc5d
Merge branch 'nexusformat:main' into main
woutdenolf Sep 15, 2025
b8a6a94
Add choice element rendering in documentation
mretegan Feb 7, 2026
50fac34
Preserve XML document order when rendering
mretegan Feb 7, 2026
8a05745
Revisiting non-FAIRmat constructive solid geometry in light of FAIRma…
mkuehbach Sep 16, 2025
fafb8e1
removed unused namespace prefixes xs and ns (#1372)
woutdenolf Sep 16, 2025
cb619db
NXstress contribution: stress-strain analysis (#1039)
woutdenolf Sep 16, 2025
f01648c
Typo: NXtomoproc nX -> nY (#1243)
samtygier-stfc Oct 15, 2025
82d3484
Generalise datatype of NXtomoproc data to NX_NUMBER (#1244)
samtygier-stfc Oct 16, 2025
786109e
NXinsertion_device: wavelength_shifter (#1587)
zdemat Oct 20, 2025
85a2c84
add spell checker in CI/CD and Makefile (#1582)
lukaspie Oct 20, 2025
dd1905a
Fairmat 2025: changes to contributed definitions (#1427)
lukaspie Oct 20, 2025
ba5c583
Fairmat 2024: groupings in manual (#1428)
lukaspie Oct 23, 2025
f488b28
Resolve "Invalid type NX_DIMENSIONLESS in NXstress" (#1597)
lukaspie Nov 12, 2025
01edb08
NXazint contribution (#1577)
woutdenolf Nov 12, 2025
9327f24
Update NXDL version for release
PeterC-DLS Nov 13, 2025
31497e8
Upload PDF of v2025.11
PeterC-DLS Nov 13, 2025
29e34af
Fix CI to allow deployment and uploads
PeterC-DLS Nov 13, 2025
5a9afa2
Update CHANGES with release v2025.11
PeterC-DLS Nov 14, 2025
8df42cd
Recategorise some application definitions for #1602
PeterC-DLS Dec 9, 2025
e8a7510
datetime.timezone.utc works for all modern python versions (3.2 -> 3.…
woutdenolf Jan 7, 2026
3394ffd
Expose deprecated attributes in docs for #1605
PeterC-DLS Jan 7, 2026
99af555
Merge branch 'nexusformat:main' into main
mretegan Feb 7, 2026
3c80c77
Add XAS detection modes with choice element
mretegan Feb 7, 2026
50516f7
Merge branch 'docs-choice-support' into xas-modes-choice
mretegan Feb 7, 2026
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
170 changes: 170 additions & 0 deletions applications/NXxas_new.nxdl.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet type="text/xsl" href="nxdlformat.xsl" ?>
<!--
# NeXus - Neutron and X-ray Common Data Format
#
# Copyright (C) 2008-2022 NeXus International Advisory Committee (NIAC)
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 3 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# For further information, see http://www.nexusformat.org
-->
<definition name="NXxas_new" extends="NXobject" type="group" category="application"
xmlns="http://definition.nexusformat.org/nxdl/3.1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd ">
<symbols>
<doc>
The symbol(s) listed here will be used below to coordinate datasets with the same shape.
</doc>
<symbol name="nEnergy">
<doc>Number of energy data points</doc>
</symbol>
<symbol name="nTransitions">
<doc>Number of electronic transitions</doc>
</symbol>
</symbols>
<doc>
This is an application definition for X-ray absorption spectroscopy.
</doc>
<group type="NXentry">
<field name="definition">
<doc> Official NeXus NXDL schema to which this file conforms. TODO: replace NXxas </doc>
<enumeration>
<item value="NXxas_new"></item>
</enumeration>
</field>
<choice name="mode">
<group type="NXtrans">
<doc>Transmission</doc>
</group>
<group type="NXtfy">
<doc>Total fluorescence yield (TFY)</doc>
</group>
<group type="NXpfy">
<doc>Partial fluorescence yield (PFY)</doc>
</group>
</choice>
<group type="NXelement" name="element">
<doc>Excited element</doc>
</group>
<group type="NXedge" name="edge">
<doc>Absorption edge</doc>
</group>
<field name="calculated" type="NX_BOOLEAN" units="NX_UNITLESS" optional="true">
<doc>Specify if the data commes from a calculation</doc>
</field>
<field name="energy" type="NX_FLOAT" units="NX_ENERGY">
<doc>TODO</doc>
<dimensions rank="1">
<dim index="1" value="nEnergy" />
</dimensions>
</field>
<field name="intensity" type="NX_FLOAT" units="NX_ANY">
<doc>TODO</doc>
<dimensions rank="1">
<dim index="1" value="nEnergy" />
</dimensions>
</field>
<field name="intensity_errors" type="NX_FLOAT" units="NX_ANY">
<doc>TODO</doc>
<dimensions rank="1">
<dim index="1" value="nEnergy" />
</dimensions>
</field>
<group type="NXsample">
<field name="name">
<doc>Descriptive name of the sample</doc>
</field>
</group>
<group type="NXprocess" optional="true">
<doc>
Description on how :ref:`energy &lt;/NXxas_new/ENTRY/energy-field&gt;`
and :ref:`intensity &lt;/NXxas_new/ENTRY/intensity-field&gt;` were obtained
from the raw data.
</doc>
</group>
<group type="NXinstrument" optional="true">
<group type="NXsource">
<field name="type"/>
<field name="name"/>
<field name="probe">
<enumeration>
<item value="x-ray"/>
</enumeration>
</field>
</group>
<group type="NXmonochromator" name="monochromator" optional="true">
<field name="energy" type="NX_FLOAT" units="NX_ENERGY" optional="true">
<dimensions rank="1">
<dim index="1" value="nEnergy" />
</dimensions>
</field>
<group type="NXcrystal" name ="crystal" optional="true">
<field name="d_spacing" type="NX_FLOAT" units="NX_LENGTH">
<doc>spacing between crystal planes of the reflection</doc>
</field>
<field name="type">
<doc>Type or material of monochromating substance (Si, Ge, Multilayer).</doc>
</field>
<field name="reflection" type="NX_INT" units="NX_UNITLESS">
<doc>Miller indices (hkl) values of nominal reflection</doc>
<dimensions>
<dim index="1" value="3"/>
</dimensions>
</field>
</group>
</group>
<group type="NXdetector" minOccurs="0" maxOccurs="unbounded">
<field name="data" type="NX_NUMBER">
<dimensions rank="1">
<dim index="1" value="nEnergy" />
</dimensions>
</field>
</group>
<group type="NXdetector" name="i0" optional="true">
<field name="data" type="NX_NUMBER">
<dimensions rank="1">
<dim index="1" value="nEnergy" />
</dimensions>
</field>
</group>
</group>
<group type="NXdata" optional="true">
<doc>XAS intensity versus energy plot</doc>
<link name="energy" target="/NXentry/energy"/>
<link name="intensity" target="/NXentry/intensity"/>
</group>
<group type="NXCollection" optional="true">
<group type="NXdata" optional="true">
<doc>Table like data structure common in the XAS domain.</doc>
<field name="data" type="NX_NUMBER">
<dimensions rank="2">
<dim index="1" value="nChan" />
<dim index="2" value="nEnergy" />
</dimensions>
</field>
<field name="columns" type="NX_CHAR">
<dimensions rank="1">
<dim index="1" value="nEnergy" />
</dimensions>
</field>
<group type="NXuser" name="data_collector" optional="true">
<field name="name"></field>
<field name="orcid"></field>
</group>
</group>
</group>
</group>
</definition>
58 changes: 58 additions & 0 deletions base_classes/NXedge.nxdl.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet type="text/xsl" href="nxdlformat.xsl" ?>
<!--
# NeXus - Neutron and X-ray Common Data Format
#
# Copyright (C) 2008-2022 NeXus International Advisory Committee (NIAC)
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 3 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# For further information, see http://www.nexusformat.org
-->
<definition name="NXedge" type="group" extends="NXobject" category="base"
xmlns="http://definition.nexusformat.org/nxdl/3.1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd">
<doc>Absorption edge</doc>
<field name="name" type="NX_CHAR" minOccurs="1" maxOccurs="1">
<doc>
Name of the edge
</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>
</definition>
Loading