Skip to content

Commit

Permalink
Implemented suggestions from @lukaspie related to points mentioned in #…
Browse files Browse the repository at this point in the history
…243

# Conflicts:
#	base_classes/NXchemical_composition.nxdl.xml
#	base_classes/NXfabrication.nxdl.xml
#	base_classes/NXfit_parameter.nxdl.xml
#	contributed_definitions/NXcorrector_ax.nxdl.xml
#	contributed_definitions/NXcorrector_cc.nxdl.xml
#	contributed_definitions/NXcorrector_cs.nxdl.xml
#	contributed_definitions/NXebeam_column.nxdl.xml
#	contributed_definitions/NXem.nxdl.xml
#	contributed_definitions/NXibeam_column.nxdl.xml
#	contributed_definitions/nyaml/NXcorrector_ax.yaml
#	contributed_definitions/nyaml/NXcorrector_cs.yaml
#	contributed_definitions/nyaml/NXebeam_column.yaml
#	contributed_definitions/nyaml/NXem.yaml
#	contributed_definitions/nyaml/NXibeam_column.yaml
#	manual/source/classes/contributed_definitions/em-structure.rst
  • Loading branch information
atomprobe-tc authored and lukaspie committed Sep 24, 2024
1 parent e0f4ed0 commit b788bb8
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 167 deletions.
45 changes: 29 additions & 16 deletions base_classes/NXfit_parameter.nxdl.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?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
Expand All @@ -21,35 +21,48 @@
#
# 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="NXregistration" extends="NXobject" 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="NXcomponent_em" extends="NXobject" xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd">
<doc>
Describes image registration procedures.
Base class for components used in an electron microscope.

The electron microscope can be a real one or a simulated microscope.
</doc>
<attribute name="depends_on" type="NX_CHAR">
<doc>
Specifies the position of the component by pointing to the last
transformation in the transformation chain that is defined
via the NXtransformations group.
</doc>
</attribute>
<field name="applied" type="NX_BOOLEAN">
<doc>
Has the registration been applied?
Was the component used?
</doc>
</field>
<field name="last_process" type="NX_CHAR">
<field name="name" type="NX_CHAR">
<doc>
Indicates the name of the last operation applied in the NXprocess sequence.
Given name to the component.

Exemplar value stage, lens C1.
</doc>
</field>
<field name="depends_on" type="NX_CHAR">
<group name="fabrication" type="NXfabrication"/>
<group name="identifier" type="NXidentifier"/>
<field name="description" type="NX_CHAR">
<doc>
Specifies the position by pointing to the last transformation in the
transformation chain in the NXtransformations group.
Ideally, use identifier to point to a resource which provides
further details of the component.

If such a resource does not exist or should not be used,
use this, though discouraged, free-text field to report
further details about the component.
</doc>
</field>
<group type="NXprogram"/>
<group type="NXtransformations">
<doc>
To describe the operations of image registration (combinations of rigid
translations and rotations)
Collection of axis-based translations and rotations to describe the
location and geometry of the component in the instrument.
</doc>
</group>
<field name="description" type="NX_CHAR">
<doc>
Description of the procedures employed.
</doc>
</field>
</definition>
62 changes: 0 additions & 62 deletions contributed_definitions/NXcorrector_ax.nxdl.xml

This file was deleted.

51 changes: 0 additions & 51 deletions contributed_definitions/NXcorrector_cc.nxdl.xml

This file was deleted.

4 changes: 2 additions & 2 deletions contributed_definitions/NXebeam_column.nxdl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<?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 Down
4 changes: 2 additions & 2 deletions contributed_definitions/NXibeam_column.nxdl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<?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 Down
3 changes: 3 additions & 0 deletions contributed_definitions/nyaml/NXcomponent_em.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ NXcomponent_em(NXobject):
Specifies the position of the component by pointing to the last
transformation in the transformation chain that is defined
via the NXtransformations group.
applied(NX_BOOLEAN):
doc: |
Was the component used?
name(NX_CHAR):
doc: |
Given name to the component.
Expand Down
34 changes: 0 additions & 34 deletions contributed_definitions/nyaml/NXcorrector_ax.yaml

This file was deleted.

0 comments on commit b788bb8

Please sign in to comment.