Merge pull request #473 from FAIRmat-NFDI/update-defs

Update NeXus definitions
FAIRmat-NFDI · Nov 28, 2024 · 1cb5a34 · 1cb5a34
2 parents 8d9931c + 33eb315
commit 1cb5a34
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/src/pynxtools/definitions b/src/pynxtools/definitions
diff --git a/src/pynxtools/nexus-version.txt b/src/pynxtools/nexus-version.txt
@@ -1 +1 @@
-v2022.07-1490-gd3c5237d
+v2022.07-1518-g4931f392
diff --git a/tests/data/nexus/Ref_nexus_test.log b/tests/data/nexus/Ref_nexus_test.log
@@ -1605,6 +1605,16 @@ DEBUG - -> Optical Laser
 DEBUG - -> Ion Source
 DEBUG - -> UV Plasma Source
 DEBUG - -> Metal Jet X-ray
+DEBUG - -> Laser
+DEBUG - -> Dye-Laser
+DEBUG - -> Broadband Tunable Light Source
+DEBUG - -> Halogen lamp
+DEBUG - -> LED
+DEBUG - -> Mercury Cadmium Telluride
+DEBUG - -> Deuterium Lamp
+DEBUG - -> Xenon Lamp
+DEBUG - -> Globar
+DEBUG - -> other
 DEBUG - documentation (NXarpes.nxdl.xml:/ENTRY/INSTRUMENT/SOURCE/type):
 DEBUG - 
 DEBUG - documentation (NXsource.nxdl.xml:/type):
@@ -1803,6 +1813,16 @@ DEBUG - -> Optical Laser
 DEBUG - -> Ion Source
 DEBUG - -> UV Plasma Source
 DEBUG - -> Metal Jet X-ray
+DEBUG - -> Laser
+DEBUG - -> Dye-Laser
+DEBUG - -> Broadband Tunable Light Source
+DEBUG - -> Halogen lamp
+DEBUG - -> LED
+DEBUG - -> Mercury Cadmium Telluride
+DEBUG - -> Deuterium Lamp
+DEBUG - -> Xenon Lamp
+DEBUG - -> Globar
+DEBUG - -> other
 DEBUG - documentation (NXarpes.nxdl.xml:/ENTRY/INSTRUMENT/SOURCE/type):
 DEBUG - 
 DEBUG - documentation (NXsource.nxdl.xml:/type):
+6 −6		.github/workflows/ci.yaml
+39 −0		.github/workflows/validate.yaml
+26 −0		base_classes/NXsource.nxdl.xml
+40 −2		base_classes/nyaml/NXsource.yaml
+3 −6		contributed_definitions/NXapm_msr.nxdl.xml
+3 −11		contributed_definitions/NXapm_sim.nxdl.xml
+4 −4		contributed_definitions/NXcrystal_structure.nxdl.xml
+31 −37		contributed_definitions/NXem.nxdl.xml
+5 −5		contributed_definitions/NXem_ebsd.nxdl.xml
+4 −6		contributed_definitions/NXem_img.nxdl.xml
+13 −0		contributed_definitions/NXfit_background.nxdl.xml
+54 −57		contributed_definitions/NXoptical_spectroscopy.nxdl.xml
+13 −0		contributed_definitions/NXpeak.nxdl.xml
+21 −39		contributed_definitions/NXxps.nxdl.xml
+6 −6		contributed_definitions/NXxrd.nxdl.xml
+3 −3		contributed_definitions/nyaml/NXapm_msr.yaml
+2 −11		contributed_definitions/nyaml/NXapm_sim.yaml
+3 −3		contributed_definitions/nyaml/NXcrystal_structure.yaml
+31 −31		contributed_definitions/nyaml/NXem.yaml
+4 −4		contributed_definitions/nyaml/NXem_ebsd.yaml
+4 −4		contributed_definitions/nyaml/NXem_img.yaml
+25 −1		contributed_definitions/nyaml/NXfit_background.yaml
+1,011 −675		contributed_definitions/nyaml/NXoptical_spectroscopy.yaml
+25 −1		contributed_definitions/nyaml/NXpeak.yaml
+42 −68		contributed_definitions/nyaml/NXxps.yaml
+115 −13		contributed_definitions/nyaml/NXxrd.yaml
+16 −11		dev_tools/__main__.py
+3 −3		dev_tools/apps/dir_app.py
+17 −0		dev_tools/apps/test_app.py
+5 −0		manual/source/_static/details_summary_hide.css
+7 −2		manual/source/conf.py
+1 −1		manual/source/datarules.rst