Skip to content

Commit

Permalink
Fixes for NXem
Browse files Browse the repository at this point in the history
# Conflicts:
#	contributed_definitions/NXebeam_column.nxdl.xml
#	contributed_definitions/nyaml/NXapm_compositionspace_results.yaml
#	contributed_definitions/nyaml/NXebeam_column.yaml
#	contributed_definitions/nyaml/NXlens_em.yaml
#	contributed_definitions/nyaml/NXoptical_system_em.yaml
  • Loading branch information
atomprobe-tc authored and lukaspie committed Sep 24, 2024
1 parent 5604e2e commit 6c13524
Show file tree
Hide file tree
Showing 6 changed files with 585 additions and 9 deletions.
12 changes: 6 additions & 6 deletions base_classes/NXlens_em.nxdl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -87,18 +87,18 @@ with other research fields (MPES, XPS, OPT) could be useful-->
</field>
<field name="value" type="NX_NUMBER" units="NX_ANY">
<doc>
This field should be used when the exact voltage or current of the lens
is not directly controllable as the control software of the microscope
does not enable or was not configured to display these values.
This field should be used when the exact voltage or current of the lens is not
directly controllable as the control software of the microscope does not enable
or was not configured to display these values (for end users).

In this case this value field should be used and the value
from the control software stored as is.

Although this value does not document the exact physical voltage or
excitation, it can still give useful context to reproduce the lens setting,
which, provided a properly working instrument and software sets the lens
into a similar state to the technical level possible when no more information
is available physically or accessible legally.
provided a properly working instrument and software sets the lens
into a similar state to the technical level possible when no more
information is available physically or accessible legally.
</doc>
</field>
<field name="mode" type="NX_CHAR">
Expand Down
73 changes: 73 additions & 0 deletions contributed_definitions/NXapm_compositionspace_config.nxdl.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
<?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
# 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="application" type="group" name="NXapm_compositionspace_config" extends="NXobject" 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="n_voxel">
<doc>
Number of voxel of discretized domain for analyzed part of the dataset.
</doc>
</symbol>
<symbol name="d">
<doc>
The dimensionality of the grid.
</doc>
</symbol>
<symbol name="c">
<doc>
The cardinality or total number of cells/grid points.
</doc>
</symbol>
<symbol name="n_clst_dict">
<doc>
Number of terms in the composition clustering dictionary
</doc>
</symbol>
<symbol name="n_spat_dict">
<doc>
Number of terms in the position clustering dictionary
</doc>
</symbol>
</symbols>
<doc>
Config for a run with Alaukik Saxena's composition space tool.

This is an initial draft application definition for the common NFDI-MatWerk,
FAIRmat infrastructure use case IUC09 how to improve the organization and
results storage of the composition space tool and make these data at the
same time directly understandable for research data management systems
like NOMAD Oasis.
</doc>
<!--by default for appdefs the value of the exists keyword is required unless it is explicitly specified differently-->
<group type="NXentry" minOccurs="1" maxOccurs="1">
<field name="definition" type="NX_CHAR">
<attribute name="version" type="NX_CHAR"/>
<enumeration>
<item value="NXapm_compositionspace_config"/>
</enumeration>
</field>
</group>
</definition>
Loading

0 comments on commit 6c13524

Please sign in to comment.