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

Use NXidentifier branch in nexus-defs
FAIRmat-NFDI · Sep 11, 2024 · 082465d · 082465d
2 parents eef96f5 + 22f4da4
commit 082465d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 21 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "src/pynxtools/definitions"]
 	path = src/pynxtools/definitions
-	url = https://github.com/FAIRmat-NFDI/nexus_definitions.git
+	url = https://github.com/FAIRmat-NFDI/nexus_definitions.git
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-1454-g05df4f05
+v2022.07-1470-gb90d4940
diff --git a/tests/data/nexus/Ref_nexus_test.log b/tests/data/nexus/Ref_nexus_test.log
@@ -75,8 +75,8 @@ DEBUG -
                 is optional, otherwise, it is required.
 
                 .. [#] NIAC2016:
-             	  https://www.nexusformat.org/NIAC2016.html,
-             	  https://github.com/nexusformat/NIAC/issues/16
+                   https://www.nexusformat.org/NIAC2016.html,
+                   https://github.com/nexusformat/NIAC/issues/16
 
 DEBUG - documentation (NXdata.nxdl.xml:):
 DEBUG - 
@@ -440,26 +440,14 @@ DEBUG -
 
 DEBUG - ===== FIELD (//entry/entry_identifier): <HDF5 dataset "entry_identifier": shape (), type "|O">
 DEBUG - value: b'Run 22118' 
-DEBUG - classpath: ['NXentry', 'NX_CHAR']
-DEBUG - classes:
-NXentry.nxdl.xml:/entry_identifier
-DEBUG - <<OPTIONAL>>
-DEBUG - documentation (NXentry.nxdl.xml:/entry_identifier):
+DEBUG - classpath: ['NXentry']
+DEBUG - NOT IN SCHEMA
 DEBUG - 
-             unique identifier for the measurement, defined by the facility.
-
 DEBUG - ===== FIELD (//entry/experiment_identifier): <HDF5 dataset "experiment_identifier": shape (), type "|O">
 DEBUG - value: b'F-20170538' 
-DEBUG - classpath: ['NXentry', 'NX_CHAR']
-DEBUG - classes:
-NXentry.nxdl.xml:/experiment_identifier
-DEBUG - <<OPTIONAL>>
-DEBUG - documentation (NXentry.nxdl.xml:/experiment_identifier):
+DEBUG - classpath: ['NXentry']
+DEBUG - NOT IN SCHEMA
 DEBUG - 
-             Unique identifier for the experiment,
-             defined by the facility,
-             possibly linked to the proposals
-
 DEBUG - ===== GROUP (//entry/instrument [NXarpes::/NXentry/NXinstrument]): <HDF5 group "/entry/instrument" (11 members)>
 DEBUG - classpath: ['NXentry', 'NXinstrument']
 DEBUG - classes:
+0 −2		.github/workflows/fairmat-build-pages.yaml
+3 −1		base_classes/NXbeam.nxdl.xml
+18 −16		base_classes/NXentry.nxdl.xml
+10 −0		base_classes/NXmonochromator.nxdl.xml
+5 −0		base_classes/NXsample.nxdl.xml
+211 −170		base_classes/NXsubentry.nxdl.xml
+1 −1		base_classes/NXuser.nxdl.xml
+3 −1		base_classes/nyaml/NXbeam.yaml
+4 −4		base_classes/nyaml/NXentry.yaml
+6 −0		base_classes/nyaml/NXmonochromator.yaml
+9 −1		base_classes/nyaml/NXsample.yaml
+3 −3		base_classes/nyaml/NXsubentry.yaml
+76 −68		base_classes/nyaml/NXuser.yaml
+1 −1		contributed_definitions/NXapm.nxdl.xml
+1 −1		contributed_definitions/NXellipsometry.nxdl.xml
+17 −17		contributed_definitions/NXem.nxdl.xml
+8 −3		contributed_definitions/NXfabrication.nxdl.xml
+3 −14		contributed_definitions/NXidentifier.nxdl.xml
+6 −6		contributed_definitions/NXlab_electro_chemo_mechanical_preparation.nxdl.xml
+6 −6		contributed_definitions/NXlab_sample_mounting.nxdl.xml
+8 −7		contributed_definitions/NXmpes.nxdl.xml
+2 −8		contributed_definitions/NXoptical_spectroscopy.nxdl.xml
+1 −1		contributed_definitions/NXsensor_scan.nxdl.xml
+30 −16		contributed_definitions/NXsts.nxdl.xml
+15 −12		contributed_definitions/NXtransmission.nxdl.xml
+1 −1		contributed_definitions/nyaml/NXapm.yaml
+1 −0		contributed_definitions/nyaml/NXellipsometry.yaml
+17 −17		contributed_definitions/nyaml/NXem.yaml
+15 −7		contributed_definitions/nyaml/NXfabrication.yaml
+60 −6		contributed_definitions/nyaml/NXidentifier.yaml
+1 −1		contributed_definitions/nyaml/NXlab_electro_chemo_mechanical_preparation.yaml
+1 −1		contributed_definitions/nyaml/NXlab_sample_mounting.yaml
+18 −15		contributed_definitions/nyaml/NXmpes.yaml
+2 −7		contributed_definitions/nyaml/NXoptical_spectroscopy.yaml
+1 −1		contributed_definitions/nyaml/NXsensor_scan.yaml
+3 −3		contributed_definitions/nyaml/NXsts.yaml
+2 −2		contributed_definitions/nyaml/NXtransmission.yaml
+8 −1		dev_tools/utils/nxdl_utils.py