From a0966392654c070a771464d986850e5c72094e7f Mon Sep 17 00:00:00 2001 From: domna Date: Tue, 12 Sep 2023 09:58:37 +0200 Subject: [PATCH] Fixes mpes config file --- .../dataconverter/readers/mpes/config_file.json | 16 ++++++++-------- tests/dataconverter/test_readers.py | 12 +----------- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/tests/data/dataconverter/readers/mpes/config_file.json b/tests/data/dataconverter/readers/mpes/config_file.json index c584a5011..a4511a75f 100644 --- a/tests/data/dataconverter/readers/mpes/config_file.json +++ b/tests/data/dataconverter/readers/mpes/config_file.json @@ -339,12 +339,12 @@ "/ENTRY[entry]/DATA[data]/@signal": "data", "/ENTRY[entry]/DATA[data]/data": "@data:data", "/ENTRY[entry]/DATA[data]/data/@units": "counts", - "/ENTRY[entry]/DATA[data]/VARIABLE[kx]": "@data:kx.data", - "/ENTRY[entry]/DATA[data]/VARIABLE[kx]/@units": "@data:kx.unit", - "/ENTRY[entry]/DATA[data]/VARIABLE[ky]": "@data:ky.data", - "/ENTRY[entry]/DATA[data]/VARIABLE[ky]/@units": "@data:ky.unit", - "/ENTRY[entry]/DATA[data]/VARIABLE[energy]": "@data:energy.data", - "/ENTRY[entry]/DATA[data]/VARIABLE[energy]/@units": "@data:energy.unit", - "/ENTRY[entry]/DATA[data]/VARIABLE[delay]": "@data:delay.data", - "/ENTRY[entry]/DATA[data]/VARIABLE[delay]/@units": "@data:delay.unit" + "/ENTRY[entry]/DATA[data]/AXISNAME[kx]": "@data:kx.data", + "/ENTRY[entry]/DATA[data]/AXISNAME[kx]/@units": "@data:kx.unit", + "/ENTRY[entry]/DATA[data]/AXISNAME[ky]": "@data:ky.data", + "/ENTRY[entry]/DATA[data]/AXISNAME[ky]/@units": "@data:ky.unit", + "/ENTRY[entry]/DATA[data]/AXISNAME[energy]": "@data:energy.data", + "/ENTRY[entry]/DATA[data]/AXISNAME[energy]/@units": "@data:energy.unit", + "/ENTRY[entry]/DATA[data]/AXISNAME[delay]": "@data:delay.data", + "/ENTRY[entry]/DATA[data]/AXISNAME[delay]/@units": "@data:delay.unit" } \ No newline at end of file diff --git a/tests/dataconverter/test_readers.py b/tests/dataconverter/test_readers.py index 5c886d795..79ec89bf4 100644 --- a/tests/dataconverter/test_readers.py +++ b/tests/dataconverter/test_readers.py @@ -105,17 +105,7 @@ def test_has_correct_read_func(reader): @pytest.mark.parametrize("reader_name,nxdl,undocumented_keys", [ - ('mpes', 'NXmpes', [ - '/@default', - '/ENTRY[entry]/DATA[data]/VARIABLE[kx]', - '/ENTRY[entry]/DATA[data]/VARIABLE[kx]/@units', - '/ENTRY[entry]/DATA[data]/VARIABLE[ky]', - '/ENTRY[entry]/DATA[data]/VARIABLE[ky]/@units', - '/ENTRY[entry]/DATA[data]/VARIABLE[energy]', - '/ENTRY[entry]/DATA[data]/VARIABLE[energy]/@units', - '/ENTRY[entry]/DATA[data]/VARIABLE[delay]', - '/ENTRY[entry]/DATA[data]/VARIABLE[delay]/@units', - ]) + ('mpes', 'NXmpes', ['/@default']) ]) def test_shows_correct_warnings(reader_name, nxdl, undocumented_keys): """