Niac changes for apm, em, cg, and ms brought back to fairmat assuming that these will be accepted

contributed_definitions/NXaberration.nxdl.xml

@@ -3,7 +3,7 @@
 <!--
 # NeXus - Neutron and X-ray Common Data Format
 #
-# Copyright (C) 2022-2025 NeXus International Advisory Committee (NIAC)
+# Copyright (C) 2014-2025 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
@@ -27,19 +27,19 @@
     </doc>
     <field name="magnitude" type="NX_NUMBER" units="NX_ANY">
         <doc>
-             Value of the aberration coefficient.
+             Magnitude of the aberration
         </doc>
     </field>
-    <field name="uncertainty" type="NX_NUMBER" units="NX_ANY">
+    <field name="magnitude_errors" type="NX_NUMBER" units="NX_ANY">
         <doc>
-             Uncertainty of the value of the aberration coefficient
-             according to uncertainty_model.
+             Uncertainty of the magnitude of the aberration
         </doc>
     </field>
-    <field name="uncertainty_model" type="NX_CHAR">
+    <field name="magnitude_errors_model" type="NX_CHAR">
         <doc>
-             How was the uncertainty quantified e.g. via the 95% confidence interval
-             and using which algorithm or statistical model.
+             Free-text description how magnitude_errors was quantified
+             e.g. via the 95% confidence interval, variance, standard deviation,
+             using which algorithm or statistical model.
         </doc>
     </field>
     <field name="delta_time" type="NX_NUMBER" units="NX_TIME">

contributed_definitions/NXapm_compositionspace_config.nxdl.xml

@@ -3,7 +3,7 @@
 <!--
 # NeXus - Neutron and X-ray Common Data Format
 #
-# Copyright (C) 2024-2025 NeXus International Advisory Committee (NIAC)
+# Copyright (C) 2025-2025 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
@@ -29,7 +29,7 @@
 
          This is an application definition for the common NFDI-MatWerk/FAIRmat infrastructure
          use case IUC09 that explores how to improve the organization and results storage of the
-         CompositionSpace software using NeXus.
+         CompositionSpace tool by using the NeXus data model and semantics.
     </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">
@@ -40,7 +40,7 @@
             </enumeration>
         </field>
         <group name="config" type="NXobject">
-            <field name="analysis_identifier" type="NX_UINT" recommended="true"/>
+            <field name="identifier_analysis" type="NX_UINT" recommended="true"/>
             <group name="reconstruction" type="NXnote">
                 <doc>
                      Specification of the tomographic reconstruction used for this analysis.
@@ -51,7 +51,7 @@
                      to use for this analysis.
                 </doc>
                 <field name="type" type="NX_CHAR" optional="true"/>
-                <field name="path" type="NX_CHAR"/>
+                <field name="file_path" type="NX_CHAR"/>
                 <field name="checksum" type="NX_CHAR" recommended="true"/>
                 <field name="algorithm" type="NX_CHAR" recommended="true"/>
                 <field name="position" type="NX_CHAR">
@@ -75,7 +75,7 @@
                      iontype is unknown_type. The value 0 is also reserved for voxels that lie outside the dataset.
                 </doc>
                 <field name="type" type="NX_CHAR" optional="true"/>
-                <field name="identifier" type="NX_CHAR"/>
+                <field name="file_path" type="NX_CHAR"/>
                 <field name="checksum" type="NX_CHAR" recommended="true"/>
                 <field name="algorithm" type="NX_CHAR" recommended="true"/>
                 <field name="ranging_definitions" type="NX_CHAR">