FAIRmat-NFDI · lukaspie · Oct 6, 2023 · Sep 11, 2023 · Sep 11, 2023 · Sep 11, 2023
diff --git a/base_classes/NXsample.nxdl.xml b/base_classes/NXsample.nxdl.xml
@@ -486,6 +486,12 @@
              This group describes the shape of the sample
         </doc>
     </group>
+    <field name="physical_form">
+        <doc>
+             Physical form of the sample material.
+             Examples include single crystal, foil, pellet, powder, thin film, disc, foam, gas, liquid, amorphous.
+        </doc>
+    </field>
     <group type="NXsingle_crystal">
         <doc>
              If the sample is a single crystal, add description of single crystal and unit

diff --git a/base_classes/nyaml/NXdetector.yaml b/base_classes/nyaml/NXdetector.yaml
@@ -753,7 +753,7 @@ type: group
       other component groups.
 
 # ++++++++++++++++++++++++++++++++++ SHA HASH ++++++++++++++++++++++++++++++++++
-# cf337a792e12304ca6fa5767928b3a58b6527152c48a24d0406e227efc050cb7
+# c0122bf1b36ed05ee0424397d2f8d0ca22beb2fc2d5d816a37829403a91b104b
 # <?xml version="1.0" encoding="UTF-8"?>
 # <?xml-stylesheet type="text/xsl" href="nxdlformat.xsl"?>
 # <!--
@@ -764,7 +764,7 @@ type: group
 # # 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
-# # version 3 of the License, or (at your option) any later version.
+# # version 2 of the License, or (at your option) any later version.
 # #
 # # This library is distributed in the hope that it will be useful,
 # # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -982,12 +982,10 @@ type: group
 #                 <item value="3"/>
 #             </enumeration>
 #         </attribute>
+#         <attribute name="primary" type="NX_POSINT" deprecated="see: https://github.com/nexusformat/definitions/issues/436
+# ">
 #         <attribute name="primary" type="NX_POSINT" deprecated="see: https://github.com/nexusformat/definitions/issues/436">
-#             <enumeration>
-#                 <item value="1"/>
-#             </enumeration>
 #         </attribute>
-#         <attribute name="long_name">
 #             <doc>
 #                  y-axis offset from detector center
 #             </doc>

diff --git a/base_classes/nyaml/NXsample.yaml b/base_classes/nyaml/NXsample.yaml
@@ -319,6 +319,10 @@ NXsample(NXobject):
     # exists: ['min', '0']
     doc: |
       This group describes the shape of the sample
+  physical_form:
+    doc: |
+      Physical form of the sample material.
+      Examples include single crystal, foil, pellet, powder, thin film, disc, foam, gas, liquid, amorphous.
   (NXsingle_crystal):
     doc: |
       If the sample is a single crystal, add description of single crystal and unit
@@ -376,7 +380,7 @@ NXsample(NXobject):
       other component groups.
 
 # ++++++++++++++++++++++++++++++++++ SHA HASH ++++++++++++++++++++++++++++++++++
-# 359e67b69525d94347bd6db9aa776e2c77b3e87b9a30b4d6a3e90ec29253c59c
+# ac20245dbd19e3a8e9c8a002a60f8cb13541fe586265ecf52a72e691b1f28fe2
 # <?xml version="1.0" encoding="UTF-8"?>
 # <?xml-stylesheet type="text/xsl" href="nxdlformat.xsl"?>
 # <!--
@@ -865,6 +869,12 @@ NXsample(NXobject):
 #              This group describes the shape of the sample
 #         </doc>
 #     </group>
+#     <field name="physical_form">
+#         <doc>
+#              Physical form of the sample material.
+#              Examples include single crystal, foil, pellet, powder, thin film, disc, foam, gas, liquid, amorphous.
+#         </doc>
+#     </field>
 #     <group type="NXsingle_crystal">
 #         <doc>
 #              If the sample is a single crystal, add description of single crystal and unit

diff --git a/contributed_definitions/NXcalibration.nxdl.xml b/contributed_definitions/NXcalibration.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="NXcalibration" 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="NXcalibration" extends="NXobject" 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
@@ -103,9 +103,23 @@
             <dim index="1" value="ncal"/>
         </dimensions>
     </field>
-    <field name="description" type="NX_CHAR">
+    <field name="description">
         <doc>
              A description of the procedures employed.
         </doc>
     </field>
+    <group name="calibration_file" type="NXnote">
+        <doc>
+             File containing the input data for calibration.
+        </doc>
+    </group>
+    <group name="mapping" type="NXdata">
+        <doc>
+             Mapping data for calibration.
+
+             This can be used to map data points from uncalibrated 
+             to calibrated values, e.g., by multiplying each point by the
+             corresponding point in the mapping data.
+        </doc>
+    </group>
 </definition>