Recompiled NXDLs from yaml using nyaml==0.0.9

# Conflicts: # base_classes/NXprogram.nxdl.xml # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXcg_alpha_complex.nxdl.xml # contributed_definitions/NXcg_cylinder_set.nxdl.xml # contributed_definitions/NXcg_face_list_data_structure.nxdl.xml # contributed_definitions/NXcg_grid.nxdl.xml # contributed_definitions/NXcg_half_edge_data_structure.nxdl.xml # contributed_definitions/NXcg_hexahedron_set.nxdl.xml # contributed_definitions/NXcg_parallelogram_set.nxdl.xml # contributed_definitions/NXcg_point_set.nxdl.xml # contributed_definitions/NXcomponent_em.nxdl.xml # contributed_definitions/NXcorrector_cs.nxdl.xml # contributed_definitions/NXem.nxdl.xml # contributed_definitions/NXem_adf.nxdl.xml # contributed_definitions/NXem_base.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_ebsd.nxdl.xml # contributed_definitions/NXem_eds.nxdl.xml # contributed_definitions/NXgraph_edge_set.nxdl.xml # contributed_definitions/NXimage_c_set.nxdl.xml # contributed_definitions/NXimage_r_set.nxdl.xml # contributed_definitions/NXimage_r_set_diff.nxdl.xml # contributed_definitions/NXinteraction_vol_em.nxdl.xml # contributed_definitions/NXion.nxdl.xml # contributed_definitions/NXms_feature_set.nxdl.xml # contributed_definitions/NXms_ipf.nxdl.xml # contributed_definitions/NXms_mtex_config.nxdl.xml # contributed_definitions/NXms_odf.nxdl.xml # contributed_definitions/NXms_pf.nxdl.xml # contributed_definitions/NXms_recon.nxdl.xml # contributed_definitions/NXoptical_system_em.nxdl.xml # contributed_definitions/NXscanbox_em.nxdl.xml # contributed_definitions/NXspectrum_set.nxdl.xml # contributed_definitions/NXxrd.nxdl.xml # contributed_definitions/NXxrd_pan.nxdl.xml # contributed_definitions/nyaml/NXem.yaml # contributed_definitions/nyaml/NXem_base.yaml
FAIRmat-NFDI · Sep 24, 2024 · 5604e2e · 5604e2e
1 parent 8c0f8bc
commit 5604e2e
Show file tree

Hide file tree

Showing 40 changed files with 127 additions and 1,282 deletions.
diff --git a/base_classes/NXcs_filter_boolean_mask.nxdl.xml b/base_classes/NXcs_filter_boolean_mask.nxdl.xml
@@ -95,7 +95,7 @@
         <doc>
              The content of the mask. If padding is used, padding bits have to be set to 0.
         </doc>
-        <dimensions rank="1">
+        <dimensions>
             <dim index="1" value="n_total"/>
         </dimensions>
     </field>
@@ -107,7 +107,7 @@
              identifier and so on and so forth. Resolving of identifier follows
              the conventions made for depends_on, so consult the also its description.
         </doc>
-        <dimensions rank="1">
+        <dimensions>
             <dim index="1" value="n_object"/>
         </dimensions>
     </field>

diff --git a/base_classes/NXcs_profiling_event.nxdl.xml b/base_classes/NXcs_profiling_event.nxdl.xml
@@ -83,15 +83,15 @@
         <doc>
              Maximum amount of virtual memory allocated per process during the event.
         </doc>
-        <dimensions rank="1">
+        <dimensions>
             <dim index="1" value="n_processes"/>
         </dimensions>
     </field>
     <field name="max_resident_memory_snapshot" type="NX_NUMBER" units="NX_ANY">
         <doc>
              Maximum amount of resident memory allocated per process during the event.
         </doc>
-        <dimensions rank="1">
+        <dimensions>
             <dim index="1" value="n_processes"/>
         </dimensions>
     </field>

diff --git a/base_classes/NXlens_em.nxdl.xml b/base_classes/NXlens_em.nxdl.xml
@@ -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

diff --git a/base_classes/NXprogram.nxdl.xml b/base_classes/NXprogram.nxdl.xml
@@ -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
@@ -21,18 +21,41 @@
 #
 # 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_sphere_set" extends="NXcg_ellipsoid_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, which has to be at least 2.
+            </doc>
+        </symbol>
+        <symbol name="c">
+            <doc>
+                 The cardinality of the set, i.e. the number of circles or spheres.
+            </doc>
+        </symbol>
     </symbols>
     <doc>
-         Analog-to-digital converter component/integrated circuit.
+         Computational geometry description of a set of spheres.
+
+         Each sphere can have a different radius but all need to have finite volume.
     </doc>
-    <field name="value" type="NX_NUMBER" units="NX_UNITLESS">
+    <field name="radius" type="NX_NUMBER" units="NX_LENGTH">
+        <doc>
+             In the case that all spheres have the same radius.
+        </doc>
+    </field>
+    <field name="radii" type="NX_NUMBER" units="NX_LENGTH">
         <doc>
-             TBD.
+             In the case that spheres have different radius use this
+             instead of the radius field.
         </doc>
+        <dimensions>
+            <dim index="1" value="c"/>
+        </dimensions>
     </field>
 </definition>
diff --git a/base_classes/NXrotation_set.nxdl.xml b/base_classes/NXrotation_set.nxdl.xml
@@ -86,7 +86,7 @@ just how to rotate the object into the reference frame defined by depends_on-->
              An example of this most complex case is the description of the
              disorientation between crystals adjoining a hetero-phase boundary.
         </doc>
-        <dimensions rank="1">
+        <dimensions>
             <dim index="1" value="n_phases"/>
         </dimensions>
     </field>
@@ -112,7 +112,7 @@ just how to rotate the object into the reference frame defined by depends_on-->
              eventual inaccuracies just for the sake of reporting a simplified
              symmetrized description should be avoided.
         </doc>
-        <dimensions rank="1">
+        <dimensions>
             <dim index="1" value="n_phases"/>
         </dimensions>
     </field>
@@ -122,7 +122,7 @@ just how to rotate the object into the reference frame defined by depends_on-->
              crystal_symmetry and sample_symmetry. Rotations which should be
              interpreted as antipodal are not marked as such.
         </doc>
-        <dimensions rank="2">
+        <dimensions>
             <dim index="1" value="c"/>
             <dim index="2" value="4"/>
         </dimensions>
@@ -135,7 +135,7 @@ just how to rotate the object into the reference frame defined by depends_on-->
              conventions behind depends_on to resolve which of the many Euler-angle
              conventions possible (Bunge ZXZ, XYZ, Kocks, Tait, etc.) were used.
         </doc>
-        <dimensions rank="2">
+        <dimensions>
             <dim index="1" value="c"/>
             <dim index="2" value="3"/>
         </dimensions>
@@ -149,7 +149,7 @@ rotation_axis_angle(NX_NUMBER):-->
              True for all those value tuples which have assumed antipodal symmetry.
              False for all others.
         </doc>
-        <dimensions rank="1">
+        <dimensions>
             <dim index="1" value="c"/>
         </dimensions>
     </field>
@@ -160,7 +160,7 @@ rotation_axis_angle(NX_NUMBER):-->
              and sample_symmetry. The supplementary field is_antipodal can be used
              to mark orientations with the antipodal property.
         </doc>
-        <dimensions rank="2">
+        <dimensions>
             <dim index="1" value="c"/>
             <dim index="2" value="4"/>
         </dimensions>
@@ -173,7 +173,7 @@ rotation_axis_angle(NX_NUMBER):-->
              conventions behind depends_on to resolve which of the many Euler-angle
              conventions possible (Bunge ZXZ, XYZ, Kocks, Tait, etc.) were used.
         </doc>
-        <dimensions rank="2">
+        <dimensions>
             <dim index="1" value="c"/>
             <dim index="2" value="3"/>
         </dimensions>
@@ -191,7 +191,7 @@ misorientation is not necessarily in the fundamental zone-->
              obeying symmetry operations for equivalent misorientations
              as defined by crystal_symmetry and sample_symmetry.
         </doc>
-        <dimensions rank="2">
+        <dimensions>
             <dim index="1" value="c"/>
             <dim index="2" value="4"/>
         </dimensions>
@@ -201,7 +201,7 @@ misorientation is not necessarily in the fundamental zone-->
              Misorientation angular argument (eventually signed) following the same
              symmetry assumptions as expressed for the field misorientation_quaternion.
         </doc>
-        <dimensions rank="1">
+        <dimensions>
             <dim index="1" value="c"/>
         </dimensions>
     </field>
@@ -210,7 +210,7 @@ misorientation is not necessarily in the fundamental zone-->
              Misorientation axis (normalized) and signed following the same
              symmetry assumptions as expressed for the field misorientation_angle.
         </doc>
-        <dimensions rank="2">
+        <dimensions>
             <dim index="1" value="c"/>
             <dim index="2" value="3"/>
         </dimensions>
@@ -223,7 +223,7 @@ fundamental zone of SO3 for given crystal and sample symmetry-->
              obeying symmetry operations for equivalent misorientations
              as defined by crystal_symmetry and sample_symmetry.
         </doc>
-        <dimensions rank="2">
+        <dimensions>
             <dim index="1" value="c"/>
             <dim index="2" value="4"/>
         </dimensions>
@@ -235,7 +235,7 @@ fundamental zone of SO3 for given crystal and sample symmetry-->
              following the same symmetry assumptions as expressed for the field
              disorientation_quaternion.
         </doc>
-        <dimensions rank="1">
+        <dimensions>
             <dim index="1" value="c"/>
         </dimensions>
     </field>
@@ -244,7 +244,7 @@ fundamental zone of SO3 for given crystal and sample symmetry-->
              Disorientation axis (normalized) following the same symmetry assumptions
              as expressed for the field disorientation_angle.
         </doc>
-        <dimensions rank="2">
+        <dimensions>
             <dim index="1" value="c"/>
             <dim index="2" value="3"/>
         </dimensions>

diff --git a/contributed_definitions/NXcg_alpha_complex.nxdl.xml b/contributed_definitions/NXcg_alpha_complex.nxdl.xml
@@ -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

diff --git a/contributed_definitions/NXcg_cylinder_set.nxdl.xml b/contributed_definitions/NXcg_cylinder_set.nxdl.xml
@@ -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

diff --git a/contributed_definitions/NXcg_ellipsoid_set.nxdl.xml b/contributed_definitions/NXcg_ellipsoid_set.nxdl.xml
@@ -83,7 +83,7 @@
         <doc>
              If all ellipsoids in the set have the same half-axes.
         </doc>
-        <dimensions rank="1">
+        <dimensions>
             <dim index="1" value="d"/>
         </dimensions>
     </field>
@@ -92,7 +92,7 @@
              In the case that ellipsoids have different radii use this field
              instead of half_axes_radius.
         </doc>
-        <dimensions rank="2">
+        <dimensions>
             <dim index="1" value="c"/>
             <dim index="2" value="d"/>
         </dimensions>

diff --git a/contributed_definitions/NXcg_face_list_data_structure.nxdl.xml b/contributed_definitions/NXcg_face_list_data_structure.nxdl.xml
@@ -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

diff --git a/contributed_definitions/NXcg_grid.nxdl.xml b/contributed_definitions/NXcg_grid.nxdl.xml
@@ -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

diff --git a/contributed_definitions/NXcg_half_edge_data_structure.nxdl.xml b/contributed_definitions/NXcg_half_edge_data_structure.nxdl.xml
@@ -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

diff --git a/contributed_definitions/NXcg_hexahedron_set.nxdl.xml b/contributed_definitions/NXcg_hexahedron_set.nxdl.xml
@@ -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

diff --git a/contributed_definitions/NXcg_parallelogram_set.nxdl.xml b/contributed_definitions/NXcg_parallelogram_set.nxdl.xml
@@ -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

diff --git a/contributed_definitions/NXcg_point_set.nxdl.xml b/contributed_definitions/NXcg_point_set.nxdl.xml
@@ -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

diff --git a/contributed_definitions/NXcg_polygon_set.nxdl.xml b/contributed_definitions/NXcg_polygon_set.nxdl.xml
@@ -121,7 +121,7 @@ properties of the polygon primitives-->
         <doc>
              The accumulated length of the polygon edge.
         </doc>
-        <dimensions rank="1">
+        <dimensions>
             <dim index="1" value="c"/>
         </dimensions>
     </field>
@@ -132,7 +132,7 @@ properties of the polygon primitives-->
              edges of the vertex according to the sequence in the polygons array.
              Usually, the winding_order field is required to interpret the value.
         </doc>
-        <dimensions rank="1">
+        <dimensions>
             <dim index="1" value="n_total"/>
         </dimensions>
     </field>
@@ -144,7 +144,7 @@ properties of the polygon primitives-->
              * 1 - convex,
              * 2 - concave
         </doc>
-        <dimensions rank="1">
+        <dimensions>
             <dim index="1" value="c"/>
         </dimensions>
     </field>

diff --git a/contributed_definitions/NXcg_polyhedron_set.nxdl.xml b/contributed_definitions/NXcg_polyhedron_set.nxdl.xml
@@ -103,15 +103,15 @@ for clean graph-based descriptions of polyhedra.-->
              are counted for each polyhedron. This field can be used to interpret
              the array/field with the individual area values for each face.
         </doc>
-        <dimensions rank="1">
+        <dimensions>
             <dim index="1" value="c"/>
         </dimensions>
     </field>
     <field name="face_area" type="NX_NUMBER" units="NX_AREA">
         <doc>
              Area of each of the four triangular faces of each tetrahedron.
         </doc>
-        <dimensions rank="1">
+        <dimensions>
             <dim index="1" value="n_f_total"/>
         </dimensions>
     </field>
@@ -126,7 +126,7 @@ for clean graph-based descriptions of polyhedra.-->
         <doc>
              Length of each edge of each tetrahedron.
         </doc>
-        <dimensions rank="1">
+        <dimensions>
             <dim index="1" value="n_e_total"/>
         </dimensions>
     </field>