From 689a0ee2a5b6a51c955df3bd10888dd8eb5a87d6 Mon Sep 17 00:00:00 2001 From: domna Date: Fri, 19 Jan 2024 10:01:06 +0100 Subject: [PATCH] Renamings --- pynxtools/definitions | 2 +- .../dataconverter/readers/mpes/Ref_nexus_mpes.log | 14 ++++++-------- .../dataconverter/readers/mpes/config_file.json | 4 ++-- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/pynxtools/definitions b/pynxtools/definitions index ff3c3317c..9e5722e35 160000 --- a/pynxtools/definitions +++ b/pynxtools/definitions @@ -1 +1 @@ -Subproject commit ff3c3317c2cc590f2d0f98f34c189b7a04f4690b +Subproject commit 9e5722e3524571fe659e1a82d3ff7b5ac73c9061 diff --git a/tests/data/dataconverter/readers/mpes/Ref_nexus_mpes.log b/tests/data/dataconverter/readers/mpes/Ref_nexus_mpes.log index 3412b89ed..4d6b4f6d7 100644 --- a/tests/data/dataconverter/readers/mpes/Ref_nexus_mpes.log +++ b/tests/data/dataconverter/readers/mpes/Ref_nexus_mpes.log @@ -2107,16 +2107,13 @@ DEBUG - classpath: ['NXentry', 'NXinstrument', 'NXelectronanalyser', 'NXcollecti DEBUG - classes: NXlens_em.nxdl.xml:/voltage DEBUG - NXlens_em.nxdl.xml:/voltage@units [NX_VOLTAGE] -DEBUG - ===== FIELD (//entry/instrument/electronanalyser/collectioncolumn/mode): +DEBUG - ===== FIELD (//entry/instrument/electronanalyser/collectioncolumn/lens_mode): DEBUG - value: b'6kV_kmodem2.0_30VTOF_MoTe2_2340VMCP.sav' DEBUG - classpath: ['NXentry', 'NXinstrument', 'NXelectronanalyser', 'NXcollectioncolumn', 'NX_CHAR'] DEBUG - classes: -NXmpes.nxdl.xml:/ENTRY/INSTRUMENT/ELECTRONANALYSER/COLLECTIONCOLUMN/mode -NXcollectioncolumn.nxdl.xml:/mode -DEBUG - <> -DEBUG - documentation (NXmpes.nxdl.xml:/ENTRY/INSTRUMENT/ELECTRONANALYSER/COLLECTIONCOLUMN/mode): -DEBUG - -DEBUG - documentation (NXcollectioncolumn.nxdl.xml:/mode): +NXcollectioncolumn.nxdl.xml:/lens_mode +DEBUG - <> +DEBUG - documentation (NXcollectioncolumn.nxdl.xml:/lens_mode): DEBUG - Labelling of the lens setting in use. @@ -2137,7 +2134,7 @@ DEBUG - The space projected in the angularly dispersive directions, real or reciprocal DEBUG - ===== FIELD (//entry/instrument/electronanalyser/collectioncolumn/scheme): -DEBUG - value: b'angular dispersive' +DEBUG - value: b'momentum dispersive' DEBUG - classpath: ['NXentry', 'NXinstrument', 'NXelectronanalyser', 'NXcollectioncolumn', 'NX_CHAR'] DEBUG - classes: NXmpes.nxdl.xml:/ENTRY/INSTRUMENT/ELECTRONANALYSER/COLLECTIONCOLUMN/scheme @@ -2146,6 +2143,7 @@ DEBUG - <> DEBUG - enumeration (NXmpes.nxdl.xml:/ENTRY/INSTRUMENT/ELECTRONANALYSER/COLLECTIONCOLUMN/scheme): DEBUG - -> angular dispersive DEBUG - -> spatial dispersive +DEBUG - -> momentum dispersive DEBUG - -> non-dispersive DEBUG - documentation (NXmpes.nxdl.xml:/ENTRY/INSTRUMENT/ELECTRONANALYSER/COLLECTIONCOLUMN/scheme): DEBUG - diff --git a/tests/data/dataconverter/readers/mpes/config_file.json b/tests/data/dataconverter/readers/mpes/config_file.json index 6833e4eb3..e4310363e 100644 --- a/tests/data/dataconverter/readers/mpes/config_file.json +++ b/tests/data/dataconverter/readers/mpes/config_file.json @@ -103,8 +103,8 @@ }, "/ENTRY[entry]/INSTRUMENT[instrument]/ELECTRONANALYSER[electronanalyser]/COLLECTIONCOLUMN[collectioncolumn]": { "projection": "@attrs:metadata/instrument/analyzer/projection", - "scheme": "angular dispersive", - "mode": "@attrs:metadata/instrument/analyzer/lens_mode", + "scheme": "momentum dispersive", + "lens_mode": "@attrs:metadata/instrument/analyzer/lens_mode", "extractor_voltage": "@attrs:metadata/file/KTOF:Lens:Extr:V", "extractor_voltage/@units": "V", "extractor_current": "@attrs:metadata/file/KTOF:Lens:Extr:I",