From 0480e7741bf58e2661ace717ba1df180d7bbfa7e Mon Sep 17 00:00:00 2001 From: rettigl Date: Tue, 4 Jun 2024 15:56:09 +0200 Subject: [PATCH] update conversion dicts for new NXmpes definitions --- pynxtools_mpes/reader.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pynxtools_mpes/reader.py b/pynxtools_mpes/reader.py index c13b783..67979a8 100644 --- a/pynxtools_mpes/reader.py +++ b/pynxtools_mpes/reader.py @@ -173,10 +173,10 @@ def iterate_dictionary(dic, key_string): "Instrument": "INSTRUMENT[instrument]", "Analyzer": "ELECTRONANALYSER[electronanalyser]", "Manipulator": "MANIPULATOR[manipulator]", - "Beam": "beam_TYPE[beam]", + "Beam": "beamTYPE[beam]", "unit": "@units", "Sample": "SAMPLE[sample]", - "Source": "source_TYPE[source]", + "Source": "sourceTYPE[source]", "User": "USER[user]", "energy_resolution": "energy_resolution/resolution", "momentum_resolution": "RESOLUTION[momentum_resolution]/resolution", @@ -185,15 +185,16 @@ def iterate_dictionary(dic, key_string): "angular_resolution": "RESOLUTION[angular_resolution]/resolution", "sample_temperature": "temperature_sensor/value", "drain_current": "drain_current_amperemeter/value", + "photon_energy": "energy", } REPLACE_NESTED = { "SAMPLE[sample]/chemical_formula": "SAMPLE[sample]/SUBSTANCE[substance]/molecular_formula_hill", - "source_TYPE[source]/Probe": "source_TYPE[source_probe]", - "source_TYPE[source]/Pump": "source_TYPE[source_pump]", - "beam_TYPE[beam]/Probe": "beam_TYPE[beam_probe]", - "beam_TYPE[beam]/Pump": "beam_TYPE[beam_pump]", - "sample_history": "sample_history/notes", + "sourceTYPE[source]/Probe": "sourceTYPE[source_probe]", + "sourceTYPE[source]/Pump": "sourceTYPE[source_pump]", + "beamTYPE[beam]/Probe": "beamTYPE[beam_probe]", + "beamTYPE[beam]/Pump": "beamTYPE[beam_pump]", + "sample_history": "history/notes/description", "ELECTRONANALYSER[electronanalyser]/RESOLUTION[energy_resolution]": ( "ELECTRONANALYSER[electronanalyser]/energy_resolution" ),