From e28a7390cfa7b0ee369c1dc54ef79c2f4d4838db Mon Sep 17 00:00:00 2001
From: Lukas Pielsticker <50139597+lukaspie@users.noreply.github.com>
Date: Mon, 23 Sep 2024 16:55:20 +0200
Subject: [PATCH] revert unintentional changes from cherry-pick

---
 Makefile                                      | 21 +++++++++++++++++--
 .../NXcollectioncolumn.nxdl.xml               |  6 +++---
 contributed_definitions/NXmpes.nxdl.xml       | 17 ++++++++++++---
 3 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index e1d0696fa5..3a882c2568 100644
--- a/Makefile
+++ b/Makefile
@@ -60,6 +60,9 @@ test ::
 
 clean ::
 	$(RM) -rf $(BUILD_DIR)
+	$(RM) -rf $(BASE_CLASS_DIR)/$(NYAML_SUBDIR)
+	$(RM) -rf $(APPDEF_DIR)/$(NYAML_SUBDIR)
+	$(RM) -rf $(CONTRIB_DIR)/$(NYAML_SUBDIR)
 
 prepare ::
 	$(PYTHON) -m dev_tools manual --prepare --build-root $(BUILD_DIR)
@@ -94,10 +97,24 @@ all ::
 	@echo "HTML built: `ls -lAFgh $(BUILD_DIR)/manual/build/html/index.html`"
 	@echo "PDF built: `ls -lAFgh $(BUILD_DIR)/manual/build/latex/nexus.pdf`"
 
+$(BASE_CLASS_DIR)/%.nxdl.xml : $(BASE_CLASS_DIR)/$(NYAML_SUBDIR)/%.yaml
+	nyaml2nxdl $< --output-file $@
+
+$(CONTRIB_DIR)/%.nxdl.xml : $(CONTRIB_DIR)/$(NYAML_SUBDIR)/%.yaml
+	nyaml2nxdl $< --output-file $@
+
+$(APPDEF_DIR)/%.nxdl.xml : $(APPDEF_DIR)/$(NYAML_SUBDIR)/%.yaml
+	nyaml2nxdl $< --output-file $@
+
+nxdl: $(YBC_NXDL_TARGETS) $(YCONTRIB_NXDL_TARGETS) $(YAPPDEF_NXDL_TARGETS)
+
+nyaml:
+	$(MAKE) -f nyaml.mk
+
 
 # NeXus - Neutron and X-ray Common Data Format
 #
-# Copyright (C) 2008-2022 NeXus International Advisory Committee (NIAC)
+# Copyright (C) 2008-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
@@ -113,4 +130,4 @@ all ::
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
-# For further information, see http://www.nexusformat.org
\ No newline at end of file
+# For further information, see http://www.nexusformat.org
diff --git a/contributed_definitions/NXcollectioncolumn.nxdl.xml b/contributed_definitions/NXcollectioncolumn.nxdl.xml
index 67a64aa9ea..5348d55b5f 100644
--- a/contributed_definitions/NXcollectioncolumn.nxdl.xml
+++ b/contributed_definitions/NXcollectioncolumn.nxdl.xml
@@ -21,10 +21,10 @@
 #
 # 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="NXcollectioncolumn" 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" name="NXcollectioncolumn" extends="NXobject" type="group" xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd">
     <doc>
-         Subclass of NXelectronanalyser to describe the electron collection
-         column of a photoelectron analyser.
+         Subclass of NXelectronanalyser to describe the electron collection column of a
+         photoelectron analyser.
     </doc>
     <field name="scheme" type="NX_CHAR">
         <doc>
diff --git a/contributed_definitions/NXmpes.nxdl.xml b/contributed_definitions/NXmpes.nxdl.xml
index 74fbf40b65..c2bfe957c6 100644
--- a/contributed_definitions/NXmpes.nxdl.xml
+++ b/contributed_definitions/NXmpes.nxdl.xml
@@ -21,7 +21,11 @@
 #
 # 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="application" type="group" name="NXmpes" 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="application" name="NXmpes" extends="NXobject" type="group" xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd">
+    <!--Pincelli, Rettig, Arora at fhi-berlin.mpg.de, Dobener at hu-berlin.de, 06/2022
+Draft version of a NeXus application definition for photoemission,
+It is designed to be extended by other application definitions
+with higher granularity in the data description.-->
     <doc>
          This is the most general application definition for multidimensional
          photoelectron spectroscopy.
@@ -192,6 +196,7 @@
                             <item value="channeltron"/>
                         </enumeration>
                     </field>
+                    <!--ToDo: Representation of count rate calibration-->
                     <field name="detector_type" recommended="true">
                         <doc>
                              Description of the detector type.
@@ -303,8 +308,8 @@
             <field name="atom_types" recommended="true">
                 <doc>
                      List of comma-separated elements from the periodic table
-                     that are contained in the sample.
-                     If the sample substance has multiple components, all
+                     that are contained in the sample. 
+                     If the sample substance has multiple components, all 
                      elements from each component must be included in `atom_types`.
                 </doc>
             </field>
@@ -323,6 +328,11 @@
                      other metadata file. In the case these are not available, free-text description.
                 </doc>
             </group>
+            <!--Problem: if the temperature is logged, the data is an array of temperature/timestamp pairs.
+the timestamp NX_DATE_TIME structure of the timestamp can not be easily handled by just a field.
+there is a base class for this, NXlog. The NIAC decided to use the same name (temperature) instead of the previous temperature_log.
+how do I explain here in an appdef that temperature can be either NXnumber (single value or scanned array) or a NXlog?
+It seems quite contorted to ask to create a separate timestamp array when we have a base class that handles it more elegantly.-->
             <field name="temperature" type="NX_FLOAT" units="NX_TEMPERATURE">
                 <doc>
                      In the case of a fixed temperature measurement this is the scalar temperature of
@@ -339,6 +349,7 @@
                     <item value="reducing atmosphere"/>
                 </enumeration>
             </field>
+            <!--Similar situation here, ca be a single number or a log.-->
             <field name="gas_pressure" type="NX_FLOAT" units="NX_PRESSURE"/>
         </group>
         <group type="NXdata">