Merge remote-tracking branch 'upstream/main' into fairmat-2024-mpes

lukaspie · lukaspie · commit 3877b11d2990 · 2025-01-15T11:17:14.000+01:00
diff --git a/base_classes/NXactuator.nxdl.xml b/base_classes/NXactuator.nxdl.xml
@@ -27,11 +27,6 @@
          
          The condition itself is described in :ref:`NXenvironment`.
     </doc>
-    <field name="model">
-        <doc>
-             Actuator identification code/model number
-        </doc>
-    </field>
     <field name="name">
         <doc>
              Name of the actuator
@@ -42,10 +37,11 @@
              Short name of actuator used e.g. on monitor display program
         </doc>
     </field>
-    <field name="attached_to">
+    <field name="actuation_target">
         <doc>
-             Describe where the actuator is attached to.
-             This could be an instance of NXsample or a device on NXinstrument.
+             The physical component on which this actuator acts.
+             This should be a path in the NeXus tree structure.
+             For example, this could be an instance of NXsample or a device on NXinstrument.
         </doc>
     </field>
     <field name="physical_quantity">
@@ -68,34 +64,12 @@
              :Voltage: potentiostat
         </doc>
     </field>
-    <field name="OUTPUT" type="NX_FLOAT" units="NX_ANY">
+    <field name="outputVALUE" type="NX_NUMBER" units="NX_ANY" nameType="partial">
         <doc>
              Any output that the actuator produces.
-             For example, a heater can have the field heater_power(NX_FLOAT).
+             For example, a heater can have the field output_power(NX_NUMBER).
         </doc>
     </field>
-    <group name="OUTPUT_log" type="NXlog">
-        <doc>
-             Time history of actuator outputs.
-        </doc>
-    </group>
-    <group type="NXpid">
-        <doc>
-             If the actuator is PID-controlled, the settings of the PID controller can be
-             stored here.
-        </doc>
-        <field name="setpoint" type="NX_FLOAT" units="NX_ANY">
-            <doc>
-                 Nominal actuator setpoint.
-                 Can be a scalar or a vector (of [n] actuations).
-            </doc>
-        </field>
-        <group name="setpoint_log" type="NXlog">
-            <doc>
-                 Time history of actuator setpoints.
-            </doc>
-        </group>
-    </group>
     <field name="depends_on" type="NX_CHAR">
         <doc>
              Refers to the last transformation specifying the position of the actuator
@@ -110,18 +84,5 @@
              other component groups.
         </doc>
     </group>
-    <attribute name="default">
-        <doc>
-             .. index:: plotting
-             
-             Declares which child group contains a path leading
-             to a :ref:`NXdata` group.
-             
-             It is recommended (as of NIAC2014) to use this attribute
-             to help define the path to the default dataset to be plotted.
-             See https://www.nexusformat.org/2014_How_to_find_default_data.html
-             for a summary of the discussion.
-        </doc>
-    </attribute>
     <group type="NXfabrication"/>
 </definition>
diff --git a/base_classes/NXdistortion.nxdl.xml b/base_classes/NXdistortion.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" name="NXdistortion" 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" name="NXdistortion" extends="NXprocess" type="group" 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
@@ -45,11 +45,6 @@
     <doc>
          Subclass of NXprocess to describe post-processing distortion correction.
     </doc>
-    <field name="last_process" type="NX_CHAR">
-        <doc>
-             Indicates the name of the last operation applied in the NXprocess sequence.
-        </doc>
-    </field>
     <field name="applied" type="NX_BOOLEAN">
         <doc>
              Has the distortion correction been applied?
diff --git a/base_classes/NXenvironment.nxdl.xml b/base_classes/NXenvironment.nxdl.xml
@@ -92,17 +92,4 @@
              defined in an NXinstrument instance.
         </doc>
     </group>
-    <attribute name="default">
-        <doc>
-             .. index:: plotting
-
-             Declares which child group contains a path leading
-             to a :ref:`NXdata` group.
-
-             It is recommended (as of NIAC2014) to use this attribute
-             to help define the path to the default dataset to be plotted.
-             See https://www.nexusformat.org/2014_How_to_find_default_data.html
-             for a summary of the discussion.
-        </doc>
-    </attribute>
 </definition>
diff --git a/base_classes/NXfabrication.nxdl.xml b/base_classes/NXfabrication.nxdl.xml
@@ -36,35 +36,27 @@
         </doc>
         <attribute name="version" type="NX_CHAR">
             <doc>
-                 If different versions exist are possible, the value in this field should be made
+                 If it is possible that different versions exist, the value in this field should be made
                  specific enough to resolve the version.
             </doc>
         </attribute>
     </field>
-    <group name="identifier" type="NXidentifier">
-        <doc>
-             Ideally, (globally) unique persistent identifier. This may contain e.g. a hash
-             identifier of the component.
-        </doc>
-    </group>
     <field name="serial_number" type="NX_CHAR">
         <doc>
              Serial number of the component.
         </doc>
     </field>
-    <field name="construction_year" type="NX_DATE_TIME">
+    <field name="construction_date" type="NX_DATE_TIME">
         <doc>
-             Datetime of components initial construction. This refers to the date of
+             Datetime of component's initial construction. This refers to the date of
              first measurement after new construction or to the relocation date,
              if it describes a multicomponent/custom-build setup.
-             Should be a ISO8601 date/time stamp. It is recommended to add an explicit time zone,
-             otherwise the local time zone is assumed per ISO8601.
+             Just the year is often sufficient, but if a full date/time is used, it is recommended to add an explicit time zone.
         </doc>
     </field>
     <field name="capability" type="NX_CHAR">
         <doc>
-             Free-text list with eventually multiple terms of
-             functionalities which the component offers.
+             Free-text list of functionalities which the component offers.
         </doc>
     </field>
 </definition>
diff --git a/base_classes/NXregistration.nxdl.xml b/base_classes/NXregistration.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" 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" name="NXregistration" extends="NXprocess" type="group" xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd">
     <doc>
          Describes image registration procedures.
     </doc>
@@ -30,11 +30,6 @@
              Has the registration been applied?
         </doc>
     </field>
-    <field name="last_process" type="NX_CHAR">
-        <doc>
-             Indicates the name of the last operation applied in the NXprocess sequence.
-        </doc>
-    </field>
     <field name="depends_on" type="NX_CHAR">
         <doc>
              Specifies the position by pointing to the last transformation in the
diff --git a/manual/source/datarules.rst b/manual/source/datarules.rst
@@ -93,7 +93,7 @@ described by the following :index:`rules <rules; naming>`:
        ^[a-zA-Z0-9_]([a-zA-Z0-9_.]*[a-zA-Z0-9_])?$
 
    The length should be limited to no more than
-   63 characters (imposed by the HDF5 :index:`rules <rules; HDF5>` for names).
+   63 characters (historically imposed by the HDF4 :index:`rules <rules; HDF>` for names).
 
    It is recognized that some facilities will construct data files with
    group and field names with upper case letters or start names with a
