Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use NXidentifier branch in nexus-defs #425

Merged
merged 6 commits into from
Sep 11, 2024
Merged

Use NXidentifier branch in nexus-defs #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
889a8f3
use NXidentifier branch in nexus-defs
lukaspie Sep 10, 2024
d69a3cb
update defs
lukaspie Sep 10, 2024
3088f48
test different branch for raman reader
lukaspie Sep 11, 2024
6e2f7c0
update defs
lukaspie Sep 11, 2024
a2915c4
update ref test log
lukaspie Sep 11, 2024
22f4da4
update defs after merge
lukaspie Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion src/pynxtools/definitions
Open in desktop
Submodule definitions updated 38 files
+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
2 changes: 1 addition & 1 deletion src/pynxtools/nexus-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v2022.07-1454-g05df4f05
v2022.07-1470-gb90d4940
24 changes: 6 additions & 18 deletions tests/data/nexus/Ref_nexus_test.log
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -
Expand Down Expand Up @@ -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:
Expand Down
Loading