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

MPES: new concepts from NIAC discussions, searchable fields #329

Open
wants to merge 50 commits into
base: fairmat
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
c0b193c
readd named axes in NXmpes
lukaspie Feb 5, 2025
a4ea2db
remove NXprocess_mpes, bring into application definition
lukaspie Feb 5, 2025
d05a4cf
use specifically named beams and sources
lukaspie Feb 5, 2025
3aabad7
use identifier instead of NXidentifier
lukaspie Feb 5, 2025
646f565
remove MPES-specific base classes
lukaspie Feb 5, 2025
1e74b2f
use math notation in NXelectron_level
lukaspie Feb 6, 2025
7f60cd7
remove NXsubstance
lukaspie Feb 12, 2025
1e342ba
add list of all possible XPS and Auger transitions
lukaspie Feb 13, 2025
de4fd0f
update nyaml
lukaspie Feb 13, 2025
db61cb4
update github artifacts
lukaspie Feb 13, 2025
95f2566
remove NXprocess_mpes from NXmpes/NXxps
lukaspie Feb 18, 2025
0f44162
clean up internal links
lukaspie Feb 18, 2025
d07331f
use easier links in nyaml files
lukaspie Feb 18, 2025
b45fab5
make requiredness consistent
lukaspie Feb 18, 2025
86e664e
consistent 4 whitespaces
lukaspie Feb 18, 2025
8492c6f
make vector attributes in NXxps an NX_NUMBER
lukaspie Feb 18, 2025
f53c9a4
make vector attributes in NXmpes_arpes an NX_NUMBER
lukaspie Feb 18, 2025
b329727
use source/beam_probe in NXXps
lukaspie Feb 18, 2025
e0d45d6
bring in changes to NXfit base classes from NIAC proposal
lukaspie Feb 18, 2025
9d2fc17
start refactoring NXxps/NXfit
lukaspie Feb 19, 2025
8009ea2
improve wording
lukaspie Feb 20, 2025
6f0f547
make use of nameTYPE in NXmpes
lukaspie Feb 20, 2025
0ed8ca2
use nameType in NXxps
lukaspie Feb 20, 2025
4848705
add explicit descriptions of functions in XPS
lukaspie Feb 20, 2025
bb3da44
make _indices NX_INT
lukaspie Feb 25, 2025
a8603e2
make axes consistently optional
lukaspie Feb 26, 2025
009b423
remove long list of core levels, replace by examples
lukaspie Feb 26, 2025
2a58f12
remove NXelectron_level for now
lukaspie Feb 26, 2025
ad9f1ed
Apply suggestions from code review
lukaspie Feb 26, 2025
7d25759
use proper associated_beam, small fixes to data types
lukaspie Feb 26, 2025
615b231
small changes from review
lukaspie Feb 26, 2025
2b1adf6
make NXenergydispersion/energy_scan_mode an open enum
lukaspie Feb 26, 2025
14ce5d1
remove NXidentifier
lukaspie Feb 26, 2025
0b2a3f2
spell fixes (yaml)
rettigl Feb 27, 2025
e6b9b3f
remove NXcoordinate_system_set
lukaspie Feb 28, 2025
7d1d27f
regenerate NXDL files
lukaspie Feb 28, 2025
726bde0
Merge branch 'fairmat' into mpes-refactor
lukaspie Feb 28, 2025
6ad23ec
remove fields from NXenergydipersion that are anyway inherited
lukaspie Feb 28, 2025
863bed1
correct copyright and docs indentation
lukaspie Feb 28, 2025
b9fe0b2
remove comment in NXmpes_arpes
lukaspie Feb 28, 2025
719ce6e
Merge branch 'jenkins-build-file' into mpes-refactor
lukaspie Feb 28, 2025
b1880ce
remove math notation
lukaspie Feb 28, 2025
10a2147
Merge branch 'fairmat' into mpes-refactor
lukaspie Mar 5, 2025
f8c6d62
bring in NXbeam from main
lukaspie Mar 5, 2025
c4bc709
rename all instances of analyser to analyzer
lukaspie Mar 5, 2025
648186d
typo fixes in MPES definitions
lukaspie Mar 5, 2025
0c67f68
adjust NXelectronanalyzer in mpes-structure
lukaspie Mar 5, 2025
e207dd2
Merge remote-tracking branch 'origin/fairmat' into mpes-refactor
lukaspie Mar 5, 2025
bff0197
use NXelectron_detector
lukaspie Mar 5, 2025
ef289ef
fix internal links in MPES
lukaspie Mar 5, 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
43 changes: 21 additions & 22 deletions contributed_definitions/NXcollectioncolumn.nxdl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,41 +21,40 @@
#
# 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="NXcollectioncolumn" extends="NXcomponent" type="group" 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="NXcollectioncolumn" extends="NXcomponent" xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd">
<doc>
Subclass of NXelectronanalyser to describe the electron collection
column of a photoelectron analyser.
Electron collection column of a photoelectron analyzer.
</doc>
<field name="scheme" type="NX_CHAR">
<doc>
Scheme of the electron collection lens, i.e. angular dispersive,
spatial dispersive, momentum dispersive, non-dispersive, etc.
Scheme of the electron collection lens, i.e. angular dispersive,
spatial dispersive, momentum dispersive, non-dispersive, etc.
</doc>
</field>
<field name="extractor_voltage" type="NX_FLOAT" units="NX_VOLTAGE">
<doc>
Voltage applied to the extractor lens
Voltage applied to the extractor lens
</doc>
</field>
<field name="extractor_current" type="NX_FLOAT" units="NX_CURRENT">
<doc>
Current necessary to keep the extractor lens at a set voltage. Variations
indicate leakage, field emission or arc currents to the extractor lens.
Current necessary to keep the extractor lens at a set voltage. Variations
indicate leakage, field emission or arc currents to the extractor lens.
</doc>
</field>
<field name="working_distance" type="NX_FLOAT" units="NX_LENGTH">
<doc>
Distance between sample and detector entrance
Distance between sample and detector entrance
</doc>
</field>
<field name="lens_mode" type="NX_CHAR">
<doc>
Labelling of the lens setting in use.
Labelling of the lens setting in use.
</doc>
</field>
<field name="projection" type="NX_CHAR">
<doc>
The space projected in the angularly dispersive directions, real or reciprocal
The space projected in the angularly dispersive directions, real or reciprocal
</doc>
<enumeration>
<item value="real"/>
Expand All @@ -64,37 +63,37 @@
</field>
<field name="angular_acceptance" type="NX_FLOAT" units="NX_ANGLE">
<doc>
Acceptance angle of the collection column.
This concept is related to term `7.4`_ of the ISO 18115-1:2023 standard.
.. _7.4: https://www.iso.org/obp/ui/en/#iso:std:iso:18115:-1:ed-3:v1:en:term:7.4
Acceptance angle of the collection column.

This concept is related to term `7.4`_ of the ISO 18115-1:2023 standard.

.. _7.4: https://www.iso.org/obp/ui/en/#iso:std:iso:18115:-1:ed-3:v1:en:term:7.4
</doc>
</field>
<field name="spatial_acceptance" type="NX_FLOAT" units="NX_LENGTH">
<doc>
Acceptance length or area of the collection column.
Acceptance length or area of the collection column.
</doc>
</field>
<field name="magnification" type="NX_FLOAT" units="NX_DIMENSIONLESS">
<doc>
The magnification of the electron lens assembly.
The magnification of the electron lens assembly.
</doc>
</field>
<group type="NXaperture">
<doc>
The size and position of an aperture inserted in the column, e.g. field aperture
or contrast aperture
The size and position of an aperture inserted in the column, e.g. field aperture
or contrast aperture
</doc>
</group>
<group type="NXdeflector">
<doc>
Deflectors in the collection column section
Deflectors in the collection column section
</doc>
</group>
<group type="NXlens_em">
<doc>
Individual lenses in the collection column section
Individual lenses in the collection column section
</doc>
</group>
<group type="NXfabrication"/>
Expand Down
134 changes: 0 additions & 134 deletions contributed_definitions/NXdata_mpes.nxdl.xml

This file was deleted.

147 changes: 0 additions & 147 deletions contributed_definitions/NXdata_mpes_detector.nxdl.xml

This file was deleted.

Loading
Loading