Skip to content
Merged
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
1262 commits
Select commit Hold shift + click to select a range
27bf927
Removed some unneeded comments
lukaspie May 5, 2023
42f7f72
Add description of instrument orientation
lukaspie May 5, 2023
34e9046
Move orientation of instrument parts
lukaspie May 9, 2023
d60f860
Update transmission function information
lukaspie May 9, 2023
ffeb32c
Update documentation, add comments for discussion
lukaspie May 9, 2023
8880b42
fix NXmpes yaml
lukaspie Jan 4, 2024
0e2201c
update to current NXmpes status
lukaspie Jan 9, 2024
7600d27
refine NXtransformations
lukaspie Jan 9, 2024
563d4e9
add coordinate system and coordinate_system_set
lukaspie Jan 12, 2024
51b28b2
Adds mpes_xps to mpes structure
domna Jan 29, 2024
8029e66
rename to NXxps
lukaspie Feb 9, 2024
c0ee5a7
initial attempt at modeling XPS peak fitting
lukaspie Feb 13, 2024
8fd5c0c
add lineshape to NXpeak
lukaspie Feb 14, 2024
285de0c
update lineshape in NXpeak
lukaspie Feb 14, 2024
ac1f4e6
add NXbackground to NXfit_region
lukaspie Feb 14, 2024
a791fe5
add fitting method to NXpeak_model
lukaspie Feb 14, 2024
370f758
remove NXtransformations from NXcoordinate_system
lukaspie Feb 14, 2024
16be1b8
restructure NXfit with background and peaks
lukaspie Feb 15, 2024
ebae306
change to NXcoordinate_system_set, use NXfit in NXxps
lukaspie Feb 15, 2024
cbb06cd
add fit_function and parameters
lukaspie Feb 15, 2024
9bc7da8
use NXfit_function for peaks and backgrounds
lukaspie Feb 15, 2024
8f3856a
use NXdata in NXfit
lukaspie Feb 15, 2024
fb4652a
use new peak fitting in NXxps
lukaspie Feb 15, 2024
ecdafd3
add missing class name in NXxps
lukaspie Feb 15, 2024
45b9122
remove underscores from variable names in NXfit
lukaspie Feb 16, 2024
b0ff45c
update nyamls
lukaspie Feb 27, 2024
aa3d1a2
switch axes docs in NXfit
lukaspie Feb 27, 2024
4a0e293
use old nyaml dim notation for now
lukaspie Feb 27, 2024
b55affb
fix math notation
lukaspie Feb 27, 2024
1a70266
make nxdls
lukaspie Feb 28, 2024
5a96bfc
regenerate with nyaml==0.0.8
lukaspie Mar 4, 2024
435fe3c
make NXfit, NXpeak multi-dimensional
lukaspie Apr 10, 2024
15d4c51
redefine XPS coordinate system, small changes to XPS peak fitting
lukaspie Apr 10, 2024
7d1d9b0
required energy axis in XPS
lukaspie Apr 10, 2024
d9f01cf
fix dimensions issues
lukaspie Apr 10, 2024
25d0cb4
regenerate NXxps
lukaspie Apr 10, 2024
c9add02
make energy an NX_NUMBER
lukaspie Apr 10, 2024
097d889
remove unneeded depends_on enumerations
lukaspie Apr 19, 2024
6952cbb
align symbols across all fit-related definitions
lukaspie Apr 19, 2024
5b4410d
remove single and repeated parameters in fit
lukaspie May 2, 2024
4eab351
fix dimensions in NXpeak and NXfit_background
lukaspie May 22, 2024
f9304ba
use globlal_fit and error_function in NXfit, fix dimensions
lukaspie May 22, 2024
dbaca7e
docstring fixes in NXfit
lukaspie May 22, 2024
4b15fa3
NXfit extends NXprocess
lukaspie May 22, 2024
5b80901
fix math notation in NXfit_function
lukaspie May 22, 2024
123efd3
fix link in NXfit_function
lukaspie May 22, 2024
f4c0092
change requiredness for formulas in XPS fit
lukaspie May 22, 2024
7f37ded
small fixes for links
lukaspie May 22, 2024
c66c16e
fix issues with manual build
lukaspie May 22, 2024
8639de0
fix math notation
lukaspie May 22, 2024
c83cdc4
more math fixes
lukaspie May 22, 2024
6cc685f
regenerate NXxps and NXpeak nxdl files
lukaspie Jul 5, 2024
903d0e9
fix rebasing issues
lukaspie Jul 5, 2024
dfad4b5
make NXpeak spectrum-independent
lukaspie Aug 12, 2024
6ffb9d6
fix rebase conflicts
lukaspie Aug 30, 2024
fb0be54
fix nyaml-nxdl inconsistency
lukaspie Aug 30, 2024
e71ec46
add notes from both workshops
Sep 3, 2024
93033d6
added make nxdl and make local
Sep 3, 2024
db8b3ab
lowercase enumeration, source_type todo added, doc for ellipsometry_type
Sep 3, 2024
6a7efaf
HOW LONG? does it take to learn to make nxdl and local before commiti…
Sep 3, 2024
196f2a8
Fixes in EM
atomprobe-tc Sep 4, 2024
c7be812
Merging NXem_adf into NXem_img, enabling microstructure reconstructio…
atomprobe-tc Sep 4, 2024
073f941
Removal of non-standardized assumption that i, j, k can be used as co…
atomprobe-tc Sep 4, 2024
5659cc5
add missing elements in ellipsometry from specialized NXlens_opt
Sep 6, 2024
b6b6550
Add todo notes for beamsize and shape description
Sep 6, 2024
e1a9984
typo and note for possible rework/reconsideration of NXfabrication
Sep 6, 2024
6054ae7
Merge pull request #282 from FAIRmat-NFDI/add_workshop_notes_from_ell…
RonHildebrandt Sep 9, 2024
d2c213d
Merge branch 'fairmat' into sprint23_em_v3
atomprobe-tc Sep 9, 2024
5509209
Suggestions from lukaspie
atomprobe-tc Sep 9, 2024
788dd0b
Fixes apm
atomprobe-tc Sep 10, 2024
a5b46d4
Added undefined enum in NXidentifier
atomprobe-tc Sep 10, 2024
5a3e07d
Merge pull request #170 from FAIRmat-NFDI/158-xps-peak-fitting-in-nexus
lukaspie Sep 11, 2024
890c785
<Merge branch 'fairmat' into sprint23_em_v3
atomprobe-tc Sep 11, 2024
05df4f0
Merge pull request #278 from FAIRmat-NFDI/sprint23_em_v3
mkuehbach Sep 11, 2024
f0f7824
use NXidentifier in NXsample and NXfabrication
lukaspie Sep 10, 2024
d828f1f
rename sample name in NXoptical spectroscopy
lukaspie Sep 10, 2024
7f5cce6
make ellipsometer_type optional
lukaspie Sep 10, 2024
0b0538f
NXidentifier in NXoptical_spectroscopy instrument
lukaspie Sep 10, 2024
c40127f
remove NXsample name docs from NXoptical_spectroscopy
lukaspie Sep 10, 2024
0c6f1f9
add serial_number to NXfabrication
lukaspie Sep 11, 2024
3ceecff
use NXidentifier in NXmpes
lukaspie Sep 11, 2024
5058b2f
use NXidentifier consistently across all our contributed definitions
lukaspie Sep 11, 2024
cdc1719
decode binary strings in nxdl_utils.py
rettigl Sep 10, 2024
bbf8060
add function for decoding
rettigl Sep 10, 2024
7b03935
use NXidentifier in NXentry
lukaspie Sep 11, 2024
7f0c0c8
Merge pull request #283 from FAIRmat-NFDI/convert_binary_strings
lukaspie Sep 11, 2024
b6b3ba3
small changes to NXbeam and NXmonochromator
lukaspie Sep 11, 2024
f13e4a6
Merge pull request #285 from FAIRmat-NFDI/small-nxbeam-changes
lukaspie Sep 11, 2024
e147c24
typo fixes
lukaspie Sep 11, 2024
b90d494
Merge pull request #284 from FAIRmat-NFDI/use-nx-identifier
lukaspie Sep 11, 2024
0185e43
proper string decoding
lukaspie Sep 11, 2024
fb6c759
remove unneeded imports
lukaspie Sep 11, 2024
c543a14
black formatting
lukaspie Sep 11, 2024
4dec01e
remove code and move to pynxtools
lukaspie Sep 11, 2024
7bab9e2
remove unneeded requirements
lukaspie Sep 11, 2024
d6eabbb
escape black check
lukaspie Sep 11, 2024
e33d9a8
ignore flake8 issue
lukaspie Sep 11, 2024
f72c27f
isort imports
lukaspie Sep 11, 2024
9a9c70b
use less strict version of str decoding
lukaspie Sep 12, 2024
f40693e
slightly enhanced version of str decoding, test
lukaspie Sep 12, 2024
611af7c
remove flake error catching
lukaspie Sep 12, 2024
a2d1228
reset requirements.txt
lukaspie Sep 12, 2024
a9856f6
reformatting
lukaspie Sep 12, 2024
3039fe3
remove strict type checking
lukaspie Sep 12, 2024
b9e537c
add support for list of bytes
lukaspie Sep 12, 2024
c10e52a
formatting
lukaspie Sep 12, 2024
cf56332
Merge pull request #286 from FAIRmat-NFDI/strict-string-check
lukaspie Sep 13, 2024
6707259
add pulse_delay to NXbeam
lukaspie Sep 13, 2024
619e6f0
recreate nyaml file
lukaspie Sep 13, 2024
d3c5237
Merge pull request #288 from FAIRmat-NFDI/pulse-delay-in-nxbeam
lukaspie Sep 13, 2024
eae3eb1
Merge branch 'nexusformat/deifinitions/main' into fairmat-2024
lukaspie Sep 16, 2024
2a3e8bb
regenerate nyaml files
lukaspie Sep 16, 2024
b048270
various small fixes are merging main and fairmat
lukaspie Sep 16, 2024
1e50475
fix string No in NXelectron_level
lukaspie Sep 16, 2024
3faa2c6
remove unused MANIFEST.in
lukaspie Sep 16, 2024
5a28e07
manually reset NXem yaml file
lukaspie Sep 16, 2024
31f5e9d
format base classes and applications in accordance to existing NIAC v…
lukaspie Sep 16, 2024
2590928
revert changes to NXtransformations docs
lukaspie Sep 17, 2024
7ca8b20
add CSS tweak to hide summary
lukaspie Sep 18, 2024
b4aad7b
add css file
lukaspie Sep 18, 2024
08c4fcb
Merge pull request #293 from FAIRmat-NFDI/add-ccs-tweak-to-hide-summary
lukaspie Sep 18, 2024
09aa519
Suggestions from Lukas
atomprobe-tc Sep 19, 2024
139d664
fix dev_tools tests
lukaspie Sep 18, 2024
4abdc46
remove use of details_summary_hide
lukaspie Sep 18, 2024
d20af52
change refs in NXarpes
lukaspie Sep 19, 2024
101a093
move doc bundles to applications and base_classes
lukaspie Sep 19, 2024
4f52a8a
Merge commit '09aa5191d2e327d74f54e20aac091c94661b90fe' into fairmat-…
lukaspie Sep 19, 2024
5ac17fb
Reverting the proposal that NXmicrostructure is not just proposed for…
atomprobe-tc Sep 19, 2024
e430164
Merge commit '5ac17fba2c96b83b3aa40446ba3f57b877be93bf' into fairmat-…
lukaspie Sep 19, 2024
4e485a6
Revert one more microstructure
atomprobe-tc Sep 19, 2024
2b6e1c3
Merge commit '4e485a6cb4b185da158439b6e6c726e628eb1740' into fairmat-…
lukaspie Sep 19, 2024
81d927c
move new definitions to application and base_classes
lukaspie Sep 19, 2024
4bbc850
small update to mpes-structure
lukaspie Sep 19, 2024
69bc9dc
update category for NXxrd.nxdl. (#296)
RubelMozumder Sep 20, 2024
0200cd6
remove fairmat-specific files
lukaspie Sep 20, 2024
00645ff
remove nyaml files
lukaspie Sep 20, 2024
2287569
move NXdata_mpes* classes back to contributed
lukaspie Sep 20, 2024
1544232
revert small changes to the dev_tools
lukaspie Sep 20, 2024
105029a
change docs in NXcircuit
lukaspie Sep 20, 2024
aeeb4c5
pull out modifications for fairmat-2024-em
lukaspie Sep 20, 2024
eb8a3b2
remove classes from contributed that have been moved to base_classes
lukaspie Sep 24, 2024
8f5291b
update type in NXsource
lukaspie Sep 24, 2024
f419a09
add test on NXem application definition
lukaspie Oct 17, 2024
3bdbc5c
use pathlib.Path
lukaspie Oct 17, 2024
f3d155b
Merge remote-tracking branch 'upstream/main' into fairmat-2024-em
lukaspie Dec 11, 2024
2ed2370
parametrize test cases with fixtures
lukaspie Dec 11, 2024
cef5c28
resolve merge conflict on NXdetector
lukaspie Dec 11, 2024
84f27bf
black formatting on tests
lukaspie Dec 11, 2024
a99f94d
remove double NXpositioner from NXaperture
lukaspie Dec 11, 2024
098daa1
Merge remote-tracking branch 'upstream/main' into fairmat-2024-em
atomprobe-tc Jan 14, 2025
294468a
NXem_method removed as retrospectively considered a too tiny modifica…
atomprobe-tc Jan 14, 2025
c042083
Edits on em-specific base classes
atomprobe-tc Jan 14, 2025
da45241
Edits on NXem_ebsd based on Autumn NIAC feedback
atomprobe-tc Jan 14, 2025
dc71cc2
Latest edits on NXem_correlation before I propose to remove it cuz re…
atomprobe-tc Jan 14, 2025
2153187
Retracting NXem_correlation for now
atomprobe-tc Jan 14, 2025
7323fb5
Retraction of NXevent_data_em_set for the reason that just an additio…
atomprobe-tc Jan 14, 2025
7bc8d0a
Edits in preparation for moving NXinteraction_volume_em to the applic…
atomprobe-tc Jan 14, 2025
0c9a21f
Renaming of core base classes NXimage, NXspectrum fix incorrect usage…
atomprobe-tc Jan 14, 2025
281e842
Refactoring of NXcrystal_structure to NXphase
atomprobe-tc Jan 14, 2025
ab63fea
Renaming of NXcrystal_structure and NXphase complementing a refactori…
atomprobe-tc Jan 14, 2025
06688c1
Edits on NXphase formerly NXcrystal_structure
atomprobe-tc Jan 14, 2025
0fe77fb
Renamed NXion to NXatom reintroduction of NXcrystal_structure to use …
atomprobe-tc Jan 15, 2025
9f19af1
Fixing NXcrystal_structure
atomprobe-tc Jan 15, 2025
2ba035b
Completed refactoring and editing of NXatom, NXphase, NXcrystal_struc…
atomprobe-tc Jan 15, 2025
3cc6a20
Edited NXebeam_column
atomprobe-tc Jan 15, 2025
4de2788
Edits on NXevent_data_em
atomprobe-tc Jan 15, 2025
6ada848
Edited NXibeam, moving on to NXimage
atomprobe-tc Jan 15, 2025
e57e8bf
add specified coordinate systems for EM/APM
lukaspie Jan 16, 2025
821348a
Working on image and spectrum
atomprobe-tc Jan 16, 2025
27fc844
Unify concept naming convention from *_identifier to identifierNAME
atomprobe-tc Jan 16, 2025
080484d
Refactoring and removal of NXcrystal_structure in favour for NXunit_cell
atomprobe-tc Jan 16, 2025
f0cfc6d
Further edits and refactoring
atomprobe-tc Jan 16, 2025
5303700
Renamed NXrotation_set to NXrotation
atomprobe-tc Jan 16, 2025
6194481
Further working on em-specific base classes, next up: i) NXscanbox_em…
atomprobe-tc Jan 16, 2025
866d624
Completing first round of edits on base classes for NXem
atomprobe-tc Jan 17, 2025
c686273
Removing NXstage_lab after discussion with @lukaspie as a result of w…
atomprobe-tc Jan 17, 2025
df83b9e
Removed NX*_reference_frame.nxdl.xml after having spent more time wit…
atomprobe-tc Jan 17, 2025
d07a1cb
Merge remote-tracking branch 'upstream/main' into fairmat-2024-em
atomprobe-tc Feb 3, 2025
7fc7704
Edits in utility base classes of NXem
atomprobe-tc Feb 4, 2025
a6ccc8e
Removal of classes in contributed definitions that had been used whil…
atomprobe-tc Feb 4, 2025
77793ae
Editing and reviewing method-specific classes
atomprobe-tc Feb 4, 2025
3168f1b
BREAKING CHANGE NXem_msr to NXinstrument_em following the design of N…
atomprobe-tc Feb 4, 2025
4b4c97d
Refactored NXem, last steps remaining, i) check nameType partial, ii)…
atomprobe-tc Feb 4, 2025
c66ad94
Fixed templated concept paths in the tests
atomprobe-tc Feb 4, 2025
301a013
Added NXmanipulator from the fairmat-2024-mpes branch (commit 3255716…
atomprobe-tc Feb 5, 2025
7dfe9ef
Remaining issues solved, NXstage_lab refactored using NXmanipulator
atomprobe-tc Feb 5, 2025
4a7f283
Remove shell script for processing specific yaml to nxdl
atomprobe-tc Feb 6, 2025
fa00224
Merge remote-tracking branch 'upstream/main' into fairmat-2024-em
atomprobe-tc Mar 5, 2025
192d077
Refactoring work on base classes used in EM, here specifically with a…
atomprobe-tc Mar 5, 2025
fe83a57
Fixed use of incorrect syntax for open enumerations
atomprobe-tc Mar 6, 2025
0c5ea17
EM ready for review
atomprobe-tc Mar 6, 2025
2a10ef7
Reverting the automatically and incorrectly from github created NXcg_…
atomprobe-tc Mar 6, 2025
ec5678d
Reversion
atomprobe-tc Mar 6, 2025
55b1316
Reversion 2
atomprobe-tc Mar 6, 2025
d7a77fe
Reversion 3 contributed
atomprobe-tc Mar 6, 2025
3d12f85
Slight edits to cure effects that reversions had on compileability of…
atomprobe-tc Mar 6, 2025
95f1bd1
Reverting NXevent_data
atomprobe-tc Mar 6, 2025
ee40f51
Revert NXhistory
atomprobe-tc Mar 6, 2025
fcdaefc
Synced back with the latest edits that we have done in FAIRmat includ…
atomprobe-tc Mar 13, 2025
383cd1c
Merge remote-tracking branch 'upstream/main' into fairmat-2024-em
atomprobe-tc May 6, 2025
7d95ca6
Merge remote-tracking branch 'upstream/main' into fairmat-2024-em
atomprobe-tc May 12, 2025
e48fc54
Use prepared classes of with the latest changes for the em proposal f…
atomprobe-tc May 12, 2025
d1afc63
Move NXcoordinate_system_set back to contributed as it will overall n…
atomprobe-tc May 12, 2025
bce545a
Use prepared classes of with the latest changes for the em proposal f…
atomprobe-tc May 12, 2025
50e4c31
Use prepared classes of with the latest changes for the em proposal f…
atomprobe-tc May 12, 2025
81302b7
Use prepared classes of with the latest changes for the em proposal f…
atomprobe-tc May 12, 2025
c3588cd
Use prepared classes of with the latest changes for the em proposal f…
atomprobe-tc May 12, 2025
c68cea0
Use prepared classes of with the latest changes for the em proposal f…
atomprobe-tc May 12, 2025
943ee9b
Use prepared classes of with the latest changes for the em proposal f…
atomprobe-tc May 12, 2025
69e48b6
Use prepared classes of with the latest changes for the em proposal f…
atomprobe-tc May 12, 2025
988a52c
Use prepared classes of with the latest changes for the em proposal f…
atomprobe-tc May 12, 2025
74ee8d3
Use prepared classes of with the latest changes for the em proposal f…
atomprobe-tc May 12, 2025
1008cb2
Reviewer version complete only potential CI/CD issues and rst documen…
atomprobe-tc May 12, 2025
cd321f8
Obvious fixes for NXem tests
atomprobe-tc May 12, 2025
59dd7fe
More fixes on these em tests
atomprobe-tc May 12, 2025
f0c1a26
Linting
atomprobe-tc May 12, 2025
0bf817d
Fixed inconsistence with use of reserved keyword variable_errors
atomprobe-tc May 13, 2025
e0097d4
Changes on manual/source that were left due
atomprobe-tc May 14, 2025
5af025d
Using newest CI/CD workflows from the FAIRmat branch to make a mock P…
atomprobe-tc May 14, 2025
40f33c2
Enable manual triggering
atomprobe-tc May 14, 2025
df25584
Merge remote-tracking branch 'upstream/main' into fairmat-2024-em-doc…
atomprobe-tc May 21, 2025
9bb2c1c
Adding gas_injector to complete all relevant components for a FIB/SEM…
atomprobe-tc May 21, 2025
df37283
Two-page introduction to give reviewers with a top-level view on NXem
atomprobe-tc May 21, 2025
714e8e1
Completed two-pager on NXem, awaiting discussion with the reviewers
atomprobe-tc May 21, 2025
05594f9
cspell activated
atomprobe-tc May 27, 2025
788663c
Proof-reading two-pager.
atomprobe-tc May 27, 2025
89c34f0
Some edits of NXem that were motivated by the previous two niac telco…
atomprobe-tc Jun 8, 2025
27ee392
Merge remote-tracking branch 'upstream/main' into fairmat-2024-em-doc…
atomprobe-tc Jun 8, 2025
f960fca
Revert cspell and changes on CI/CD
atomprobe-tc Jun 8, 2025
9a99b10
Merge pull request #391 from FAIRmat-NFDI/fairmat-2024-em-docs-for-re…
mkuehbach Jun 8, 2025
d823719
Replace single quote with double quote in XML header
atomprobe-tc Jun 9, 2025
25a31bf
Merge remote-tracking branch 'upstream/main' into fairmat-2024-em
atomprobe-tc Jun 17, 2025
1b6db7b
Added feedback that was made mainly by @benajamin on #1422 but which …
atomprobe-tc Jun 17, 2025
aa3ab52
Fix broken reference to renamed NXroi in apm
atomprobe-tc Jun 17, 2025
57cb7c8
Adding figures as svg and draft for captions for each figure, reporti…
atomprobe-tc Jun 19, 2025
051ae3b
Add suggestions from members of C. Koch's group, finished method-spec…
atomprobe-tc Jun 20, 2025
bea80af
Fix the CI pipeline
atomprobe-tc Jun 20, 2025
8b50fd9
Reintroduced -W option for makefile
atomprobe-tc Jun 20, 2025
0ac59fa
Try to fix that with the current CI and sphinx settings, using direct…
atomprobe-tc Jun 20, 2025
0324046
Fix that imagemagick likely no longer uses its less robust internal s…
atomprobe-tc Jun 20, 2025
90c9416
Fix missing whitespace
atomprobe-tc Jun 20, 2025
54f6d29
Comments from Fernan Saiz and Jordi Arbiol
atomprobe-tc Jul 13, 2025
1406649
A few more quality fixes on the EM proposal
atomprobe-tc Jul 16, 2025
1273d68
Merge remote-tracking branch 'upstream/main' into fairmat-2024-em
atomprobe-tc Jul 16, 2025
0568ee0
Adding correct test_nxdl_utils from main
atomprobe-tc Jul 16, 2025
762f475
Reintroduce NXcoordinate_system_set from upstream/main to make NXapm_…
atomprobe-tc Jul 16, 2025
b864776
Refactoring of names for NXinteraction_volume_em, NXlens_em, NXoptica…
atomprobe-tc Jul 17, 2025
ec50a90
Removed unexpectedly placed character that caused the CI to break
atomprobe-tc Jul 17, 2025
31704f0
Addressing @phyy-nx's comment on use of NX_WAVENUMBER in NXimage
atomprobe-tc Jul 17, 2025
233ef85
Merge branch 'main' of github.com:nexusformat/definitions into fairma…
lukaspie Aug 14, 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
1,489 changes: 1,489 additions & 0 deletions applications/NXem.nxdl.xml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<?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) 2014-2024 NeXus International Advisory Committee (NIAC)
#
#
# Copyright (C) 2014-2025 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
Expand All @@ -21,35 +21,49 @@
#
# For further information, see http://www.nexusformat.org
-->
<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" category="base" type="group" extends="NXobject" name="NXaberration" xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd">
<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" category="base" type="group" name="NXaberration" extends="NXobject" xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd">
<doc>
Quantified aberration coefficient in an aberration_model.
</doc>
<field name="magnitude" type="NX_FLOAT" units="NX_LENGTH"/>
<field name="uncertainty" type="NX_FLOAT" units="NX_LENGTH">
<field name="magnitude" type="NX_NUMBER" units="NX_ANY">
<doc>
Magnitude of the aberration
</doc>
</field>
<field name="magnitude_errors" type="NX_NUMBER" units="NX_ANY">
<doc>
Confidence
Uncertainty of the magnitude of the aberration
</doc>
</field>
<field name="uncertainty_model">
<field name="magnitude_errors_model" type="NX_CHAR">
<doc>
How was the uncertainty quantified e.g. via the 95% confidence interval.
Free-text description how magnitude_errors was quantified
e.g. via the 95% confidence interval, variance, standard deviation,
using which algorithm or statistical model.
</doc>
</field>
<field name="delta_time" type="NX_FLOAT" units="NX_TIME">
<field name="delta_time" type="NX_NUMBER" units="NX_TIME">
<doc>
Time elapsed since the last measurement.
</doc>
</field>
<field name="angle" type="NX_FLOAT" units="NX_ANGLE">
<field name="angle" type="NX_NUMBER" units="NX_ANGLE">
<doc>
For the CEOS definitions the C aberrations are radial-symmetric and have no
angle entry, while the A, B, D, S, or R aberrations are n-fold
For the CEOS definitions the C aberrations are radial-symmetric and have
no angle entry, while the A, B, D, S, or R aberrations are n-fold
symmetric and have an angle entry.
For the NION definitions the coordinate system differs to the one
used in CEOS and instead two aberration coefficients a and b are used.
</doc>
</field>
<field name="name"/>
<field name="alias"/>
<field name="name" type="NX_CHAR">
<doc>
Given name to this aberration.
</doc>
</field>
<field name="alias" type="NX_CHAR">
<doc>
Alias also used to name and refer to this specific type of aberration.
</doc>
</field>
</definition>
133 changes: 133 additions & 0 deletions base_classes/NXatom.nxdl.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
<?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) 2014-2025 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 xmlns="http://definition.nexusformat.org/nxdl/3.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" category="base" type="group" name="NXatom" extends="NXobject" xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd">
<doc>
Base class for documenting a set of atoms.

Atoms in the set may be bonded.
The set may have a net charge to represent
an ion. Ions can be molecular ions.
</doc>
<field name="name" type="NX_CHAR">
<doc>
Given name for the set.

This field could for example be used in the research field
of atom probe tomography for storing a standardized
human-readable name of the element or (molecular) ion
like such as Al +++ or 12C +.
</doc>
</field>
<field name="identifier_chemical" type="NX_CHAR">
<doc>
Identifier used to refer to if the set of atoms represents a substance.
</doc>
<enumeration>
<item value="inchi"/>
</enumeration>
</field>
<field name="charge" type="NX_NUMBER" units="NX_CHARGE">
<doc>
Signed net (partial) charge of the (molecular) ion.

Different methods for computing charge are in use.
Care needs to be exercised with respect to the integration.
`T. A. Manz &lt;10.1039/c6ra04656h&gt;`_ and `N. G. Limas &lt;10.1039/C6RA05507A&gt;`_ discuss computational details.
</doc>
</field>
<field name="charge_state" type="NX_NUMBER" units="NX_UNITLESS">
<doc>
Charge reported in multiples of the charge of an electron.

For research using atom probe tomography the value should be set to
zero if the charge_state is unknown and irrecoverable. This can happen
when classical ranging definition files in formats like RNG, RRNG are used.
These file formats do not document the charge state explicitly but only
the number of atoms of each element per molecular ion surplus the
respective mass-to-charge-state-ratio interval.

Details on ranging definition files in the literature are `M. K. Miller &lt;https://doi.org/10.1002/sia.1719&gt;`_.
</doc>
</field>
<field name="volume" type="NX_NUMBER" units="NX_VOLUME">
<doc>
Assumed volume affected by the set of atoms.

Neither individual atoms nor a set of cluster of these have a volume
that is unique as a some cut-off criterion is required.
</doc>
</field>
<!--<group type="NXcg_point"/>-->
<field name="identifier" type="NX_CHAR">
<doc>
Identifier for each atom at locations as detailed by position.
</doc>
<dimensions rank="1">
<dim index="1" value="n_pos"/>
</dimensions>
</field>
<field name="type" type="NX_UINT" units="NX_UNITLESS">
<doc>
Nuclide information for each atom at locations as detailed by position.

One `approach &lt;https://doi.org/10.1017/S1431927621012241&gt;`_ for storing nuclide information efficiently
is via hashing with the following formula

:math:`H` is :math:`H = Z + N \cdot 256` with :math:`Z`

the number of protons and :math:`N` the number of neutrons
of each nuclide given as 8-bit unsigned integer values.
</doc>
<dimensions rank="1">
<dim index="1" value="n_pos"/>
</dimensions>
</field>
<field name="position" type="NX_NUMBER" units="NX_ANY">
<doc>
Position of each atom.
</doc>
<dimensions rank="2">
<dim index="1" value="n_pos"/>
<dim index="2" value="d"/>
</dimensions>
<attribute name="reference_frame" type="NX_CHAR">
<doc>
Path to a reference frame in which positions are defined
to resolve ambiguity when the reference frame is different
to the NeXus default reference frame (McStas).
</doc>
</attribute>
</field>
<field name="occupancy" type="NX_NUMBER" units="NX_DIMENSIONLESS">
<doc>
Relative occupancy of the atom position.

This field is useful for specifying the atomic motif in
instances of :ref:`NXunit_cell`.
</doc>
<dimensions rank="1">
<dim index="1" value="n_pos"/>
</dimensions>
</field>
</definition>
38 changes: 37 additions & 1 deletion base_classes/NXbeam.nxdl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@
If applicable, the first dimension shall represent the extent
in the direction parallel to the azimuthal reference plane
(by default it is [1,0,0]), and the second dimension shall be
the normal to the reference plane (by default it is [0,1,0]).
the normal to the reference plane (by default it is [0,1,0]).
</doc>
<dimensions rank="2">
<dim index="1" value="nP"/>
Expand All @@ -203,13 +203,49 @@
<dim index="1" value="nP"/>
<dim index="2" value="2"/>
</dimensions>
<attribute name="units" type="NX_CHAR">
<doc>
The units for this observable are not included in the NIAC list.
Responsibility on correct formatting and parsing is handed to the user
by using `NX_ANY`. Correct parsing can still be implemented by using
this attribute.

| Fill with:

* The unit unidata symbol if the unit has one (Example: T for the unit of magnetic flux density tesla).
* The unit unidata name if the unit has a name (Example: farad for capacitance).
* A string describing the units according to unidata unit operation notation, if the unit is a complex combination of named units and
does not have a name.

Example: for lightsource brilliance (SI) 1/(s.mm2.mrad2).
Here: SI units are V2/m2.
</doc>
</attribute>
</field>
<field name="final_polarization" type="NX_NUMBER" units="NX_ANY">
<doc>Polarization vector on leaving beamline component</doc>
<dimensions rank="2">
<dim index="1" value="nP"/>
<dim index="2" value="2"/>
</dimensions>
<attribute name="units" type="NX_CHAR">
<doc>
The units for this observable are not included in the NIAC list.
Responsibility on correct formatting and parsing is handed to the user
by using `NX_ANY`. Correct parsing can still be implemented by using
this attribute.

| Fill with:

* The unit unidata symbol if the unit has one (Example: T for the unit of magnetic flux density tesla).
* The unit unidata name if the unit has a name (Example: farad for capacitance).
* A string describing the units according to unidata unit operation notation, if the unit is a complex combination of named units and
does not have a name.

Example: for lightsource brilliance (SI) 1/(s.mm2.mrad2).
Here: SI units are V2/m2.
</doc>
</attribute>
</field>
<field name="incident_polarization_stokes" type="NX_NUMBER" units="NX_ANY">
<doc>
Expand Down
11 changes: 5 additions & 6 deletions base_classes/NXcalibration.nxdl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<group name="calibration_object" type="NXnote">
<doc>
A file serialisation of a calibration which may not be publicly available (externally from the NeXus file).

This metadata can be a documentation of the source (file) or database (entry) from which pieces
of information have been extracted for consumption (e.g. in a research data management system (RDMS)).
It is also possible to include the actual file by using the `file` field.
Expand Down Expand Up @@ -92,10 +92,10 @@
The symbol of the axis to be used in the fit_function, e.g., `energy`, `E`.
This should comply to the following naming rules (similar to python's naming rules):

* A variable name must start with a letter or the underscore character
* A variable name cannot start with a number
* A variable name can only contain alpha-numeric characters and underscores (A-z, 0-9, and _ )
* Variable names are case-sensitive (age, Age and AGE are three different variables)
* A variable name must start with a letter or the underscore character
* A variable name cannot start with a number
* A variable name can only contain alpha-numeric characters and underscores (A-z, 0-9, and _ )
* Variable names are case-sensitive (age, Age and AGE are three different variables)
</doc>
</attribute>
<attribute name="input_path">
Expand Down Expand Up @@ -157,7 +157,6 @@

For a more detailed description of scaling factors, see
:ref:`/NXdata/FIELDNAME_scaling_factor &lt;/NXdata/FIELDNAME_scaling_factor-field&gt;`.

</doc>
</field>
<field name="offset" type="NX_FLOAT" units="NX_ANY">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<?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) 2014-2024 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
Expand All @@ -21,18 +21,45 @@
#
# For further information, see http://www.nexusformat.org
-->
<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" category="base" name="NXadc" extends="NXobject" type="group" xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd">
<!--
redundant as there is NXcsg, and NXquadric but easier to understand-->
<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" category="base" type="group" name="NXcg_ellipsoid_set" extends="NXcg_primitive_set" xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd">
<symbols>
<doc>
The symbols used in the schema to specify e.g. dimensions of arrays.
</doc>
<symbol name="d">
<doc>
The dimensionality of the space in which the members are assumed embedded.
</doc>
</symbol>
<symbol name="c">
<doc>
The cardinality of the set, i.e. the number of members.
</doc>
</symbol>
</symbols>
<doc>
Analog-to-digital converter component/integrated circuit.
Computational geometry description of a set of ellipsoids.
</doc>
<field name="value" type="NX_NUMBER" units="NX_UNITLESS">
<field name="half_axes_radius" type="NX_NUMBER" units="NX_LENGTH">
<doc>
Radius of the half axes.

Use if all ellipsoids in the set have the same half-axes.
</doc>
<dimensions rank="1">
<dim index="1" value="d"/>
</dimensions>
</field>
<field name="half_axes_radii" type="NX_NUMBER" units="NX_LENGTH">
<doc>
TBD.
Half-axes radii of each ellipsoid.
</doc>
<dimensions rank="2">
<dim index="1" value="c"/>
<dim index="2" value="d"/>
</dimensions>
</field>
<!--properties of ellipsoids-->
</definition>
Loading