Fixes mpes config file

FAIRmat-NFDI · Sep 12, 2023 · a096639 · a096639
1 parent cce281f
commit a096639
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 19 deletions.
diff --git 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"
 }
diff --git 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):
     """