Fixes to Vamas reader, resolving of keys and values across all readers

FAIRmat-NFDI / pynxtools-xps

A pynxtools reader plugin for X-ray photoelectron spectroscopy (XPS) data

https://fairmat-nfdi.github.io/pynxtools-xps/

Apache License 2.0

2 stars 0 forks source link

Closed lukaspie closed 2 months ago

lukaspie commented 2 months ago

Vamas reader:

All readers:

[x] Harmonize key mapping such that always the same function (re_map_keys) for such mapping is used
[x] Harmonize value mapping such that the enumerations in NXmpes are always respected for all readers
[x] Following the above, update example and test data

coveralls commented 2 months ago

231 of 266 (86.84%) changed or added relevant lines in 9 files are covered.
11 unchanged lines in 3 files lost coverage.
Overall coverage increased (+2.8%) to 67.319%

Changes Missing Coverage	Covered Lines	Changed/Added Lines	%
pynxtools_xps/value_mappers.py	20	21	95.24%
pynxtools_xps/reader_utils.py	25	27	92.59%
pynxtools_xps/sle/sle_specs.py	4	13	30.77%
pynxtools_xps/vms/vamas.py	113	124	91.13%
pynxtools_xps/xy/xy_specs.py	1	13	7.69%
<!--	Total:	231	266	86.84%	-->

Files with Coverage Reduction	New Missed Lines	%
pynxtools_xps/sle/sle_specs.py	1	12.46%
pynxtools_xps/xy/xy_specs.py	5	12.76%
pynxtools_xps/phi/spe_pro_phi.py	5	95.65%
<!--	Total:	11	-->

coveralls commented 2 months ago

231 of 266 (86.84%) changed or added relevant lines in 9 files are covered.
11 unchanged lines in 3 files lost coverage.
Overall coverage increased (+2.8%) to 67.319%

Changes Missing Coverage	Covered Lines	Changed/Added Lines	%
pynxtools_xps/value_mappers.py	20	21	95.24%
pynxtools_xps/reader_utils.py	25	27	92.59%
pynxtools_xps/sle/sle_specs.py	4	13	30.77%
pynxtools_xps/vms/vamas.py	113	124	91.13%
pynxtools_xps/xy/xy_specs.py	1	13	7.69%
<!--	Total:	231	266	86.84%	-->

Files with Coverage Reduction	New Missed Lines	%
pynxtools_xps/sle/sle_specs.py	1	12.46%
pynxtools_xps/xy/xy_specs.py	5	12.76%
pynxtools_xps/phi/spe_pro_phi.py	5	95.65%
<!--	Total:	11	-->

coveralls commented 2 months ago

242 of 277 (87.36%) changed or added relevant lines in 9 files are covered.
11 unchanged lines in 3 files lost coverage.
Overall coverage increased (+2.8%) to 67.425%

Changes Missing Coverage	Covered Lines	Changed/Added Lines	%
pynxtools_xps/value_mappers.py	20	21	95.24%
pynxtools_xps/reader_utils.py	26	28	92.86%
pynxtools_xps/sle/sle_specs.py	4	13	30.77%
pynxtools_xps/vms/vamas.py	121	132	91.67%
pynxtools_xps/xy/xy_specs.py	1	13	7.69%
<!--	Total:	242	277	87.36%	-->

Files with Coverage Reduction	New Missed Lines	%
pynxtools_xps/sle/sle_specs.py	1	12.46%
pynxtools_xps/xy/xy_specs.py	5	12.76%
pynxtools_xps/phi/spe_pro_phi.py	5	95.65%
<!--	Total:	11	-->

RubelMozumder commented 2 months ago

I see this PR as mainly refactoring the code and harmonizing the different functions. LGTM!