Clarified issues with depends_on, fixed typo pID for pfID in NXem_ebsd

# Conflicts: # contributed_definitions/NXapm_hit_finding.nxdl.xml # contributed_definitions/NXapm_paraprobe_transcoder_results.nxdl.xml # contributed_definitions/NXem_ebsd.nxdl.xml # contributed_definitions/NXem_eds.nxdl.xml # contributed_definitions/nyaml/NXapm_hit_finding.yaml # contributed_definitions/nyaml/NXapm_paraprobe_transcoder_results.yaml # contributed_definitions/nyaml/NXcg_face_list_data_structure.yaml # contributed_definitions/nyaml/NXcg_half_edge_data_structure.yaml # contributed_definitions/nyaml/NXcg_polyline_set.yaml # contributed_definitions/nyaml/NXem_ebsd.yaml
FAIRmat-NFDI · Dec 11, 2024 · 81c1782 · 81c1782
1 parent 52b890e
commit 81c1782
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 40 deletions.
diff --git a/base_classes/NXcg_face_list_data_structure.nxdl.xml b/base_classes/NXcg_face_list_data_structure.nxdl.xml
@@ -23,7 +23,7 @@
 -->
 <!--
 duplicate of an NXoff_geometry ?-->
-<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" category="base" type="group" name="NXcg_face_list_data_structure" extends="NXobject" 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="NXcg_face_list_data_structure" 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.
@@ -75,17 +75,6 @@ duplicate of an NXoff_geometry ?-->
          Having an own base class for the data structure how primitives are stored is
          useful to embrace both users with small or very detailed specification demands.
     </doc>
-    <attribute name="depends_on" type="NX_CHAR">
-        <doc>
-             Hint to help resolve in which Euclidean coordinate system
-             field values vertices are defined.
-        </doc>
-    </attribute>
-    <field name="dimensionality" type="NX_POSINT" units="NX_UNITLESS">
-        <doc>
-             Dimensionality of the primitives described.
-        </doc>
-    </field>
     <!--resulting in a design similar to that of NXoff_geometry and the XDMF mixed primitive topology-->
     <field name="number_of_vertices" type="NX_INT" units="NX_UNITLESS">
         <doc>

diff --git a/base_classes/NXcg_half_edge_data_structure.nxdl.xml b/base_classes/NXcg_half_edge_data_structure.nxdl.xml
@@ -21,7 +21,7 @@
 #
 # 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="NXcg_half_edge_data_structure" extends="NXobject" 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="NXcg_half_edge_data_structure" extends="NXcg_primitive_set" xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd">
     <!--holes in the polygon mesh can be handled-->
     <symbols>
         <doc>
@@ -54,17 +54,6 @@
          Such a data structure can be used to efficiently circulate around faces
          and iterate over vertices of a planar graph.
     </doc>
-    <attribute name="depends_on" type="NX_CHAR">
-        <doc>
-             Hint to help resolve in which Euclidean coordinate system
-             field values vertices are defined.
-        </doc>
-    </attribute>
-    <field name="dimensionality" type="NX_POSINT" units="NX_UNITLESS">
-        <doc>
-             Dimensionality of the primitives described.
-        </doc>
-    </field>
     <!--resulting in a design similar to that of NXoff_geometry and the XDMF mixed primitive topology-->
     <field name="number_of_vertices" type="NX_INT" units="NX_UNITLESS">
         <doc>
@@ -187,7 +176,7 @@
             <dim index="1" value="n_he"/>
         </dimensions>
     </field>
-    <field name="weinberg_vector">
+    <field name="weinberg_vector" type="NX_CHAR">
         <doc>
              Users are referred to the literature for the background of L. Weinberg's
              work about topological characterization of planar graphs:

diff --git a/base_classes/NXcg_polyline_set.nxdl.xml b/base_classes/NXcg_polyline_set.nxdl.xml
@@ -57,13 +57,6 @@ multiple vertices possible with the same point coordinates but different names.-
          The sequence describes the positive traversal along the polyline when
          walking from the first to the last vertex.
     </doc>
-    <attribute name="depends_on" type="NX_CHAR">
-        <doc>
-             Reference to an instance of :ref:`NXcg_point_set` which defines
-             the location of the vertices that are referred to in the
-             NXcg_polyline_set instance.
-        </doc>
-    </attribute>
     <field name="number_of_unique_vertices" type="NX_POSINT" units="NX_UNITLESS">
         <doc>
              The total number of vertices that have different positions.

diff --git a/contributed_definitions/NXcg_primitive_set.nxdl.xml b/contributed_definitions/NXcg_primitive_set.nxdl.xml
@@ -66,12 +66,12 @@ on your data...-->
     <!--individual specializations like NXcg_polyline_set typically overwrite
 the meaning of the depends_on concept to build consistent inference chains
 to enable an instantiation of the actual geometric primitives-->
-    <attribute name="depends_on" type="NX_CHAR">
+    <field name="depends_on" type="NX_CHAR">
         <doc>
-             Hint to help resolve in which Euclidean coordinate system field values
-             like center or orientation are defined.
+             Reference to an instance of :ref:`NXcoordinate_system` in which these primitives
+             are defined.
         </doc>
-    </attribute>
+    </field>
     <field name="dimensionality" type="NX_POSINT" units="NX_UNITLESS">
         <doc>
              The dimensionality of the primitive set.

diff --git a/contributed_definitions/nyaml/NXcg_primitive_set.yaml b/contributed_definitions/nyaml/NXcg_primitive_set.yaml
@@ -36,10 +36,9 @@ NXcg_primitive_set(NXobject):
   # individual specializations like NXcg_polyline_set typically overwrite
   # the meaning of the depends_on concept to build consistent inference chains
   # to enable an instantiation of the actual geometric primitives
-  \@depends_on(NX_CHAR):
+  depends_on(NX_CHAR):
     doc: |
-      Hint to help resolve in which Euclidean coordinate system field values
-      like center or orientation are defined.
+      Reference to an instance of :ref:`NXcoordinate_system` in which these primitives are defined.
   dimensionality(NX_POSINT):
     doc: |
       The dimensionality of the primitive set.

diff --git a/contributed_definitions/nyaml/NXem_eds.yaml b/contributed_definitions/nyaml/NXem_eds.yaml
@@ -6,14 +6,15 @@ doc: |
 
 # NEW ISSUE: use computational geometry to offer arbitrary scan pattern
 # NEW ISSUE: make the binning flexible per scan point
+# energy typically the fastest direction
 symbols:
   # n_p: Number of scan points
   n_y: |
     Number of pixel along the y direction, the slow direction
   n_x: |
     Number of pixel along the x direction, the fast direction
   n_photon_energy: |
-    Number of X-ray photon energy (bins), the fastest direction.
+    Number of X-ray photon energy (bins) 
   n_elements: |
     Number of identified elements
   n_peaks: |