Skip to content

XPS reader: update to new NXmpes after refactor - #207

Merged
lukaspie merged 95 commits into
masterfrom
206-xps-reader-nxmpes-update
Jan 22, 2024
Merged

XPS reader: update to new NXmpes after refactor#207
lukaspie merged 95 commits into
masterfrom
206-xps-reader-nxmpes-update

Conversation

@lukaspie

@lukaspie lukaspie commented Jan 15, 2024

Copy link
Copy Markdown
Collaborator
  • Update definitions submodule after mpes-refactor
  • Add new groups/fields/group to reader config files
  • Use nested config file for the XPS sub-readers
  • Explicitly read any available information from .sle format (including units for all number field)

ToDo: Allow list of options in config file values, i.e. first the reader searches the metadata, then the ELN (will be new PR)

@lukaspie lukaspie linked an issue Jan 15, 2024 that may be closed by this pull request
2 tasks
@coveralls

Copy link
Copy Markdown

Pull Request Test Coverage Report for Build 7531083381

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage decreased (-0.06%) to 44.486%

Totals Coverage Status
Change from base Build 7277681916: -0.06%
Covered Lines: 4861
Relevant Lines: 10927

💛 - Coveralls

@coveralls

coveralls commented Jan 15, 2024

Copy link
Copy Markdown

Pull Request Test Coverage Report for Build 7613259204

  • 136 of 216 (62.96%) changed or added relevant lines in 4 files are covered.
  • 3 unchanged lines in 1 file lost coverage.
  • Overall coverage increased (+3.8%) to 44.584%

Changes Missing Coverage Covered Lines Changed/Added Lines %
pynxtools/dataconverter/readers/xps/xml/xml_specs.py 6 8 75.0%
pynxtools/dataconverter/readers/xps/reader.py 121 129 93.8%
pynxtools/dataconverter/readers/xps/sle/sle_specs.py 5 75 6.67%
Files with Coverage Reduction New Missed Lines %
pynxtools/dataconverter/readers/xps/sle/sle_specs.py 3 12.34%
Totals Coverage Status
Change from base Build 7608498774: 3.8%
Covered Lines: 4906
Relevant Lines: 11004

💛 - Coveralls

@lukaspie
lukaspie marked this pull request as ready for review January 22, 2024 06:07
Base automatically changed from mpes-reader-update to master January 22, 2024 08:39
domna
domna previously approved these changes Jan 22, 2024

@domna domna left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, except the logging file needs to be removed. I don't know if there are other parts which need to be adapted from #209

Comment thread .gitmodules Outdated
Comment thread pynxtools/dataconverter/logger.py Outdated
@domna
domna dismissed their stale review January 22, 2024 09:37

Still some failing tests

@domna

domna commented Jan 22, 2024

Copy link
Copy Markdown
Contributor

Sorry, I was too quick. There seem still to be a few tests failing after re-enabling the XPSReader test

@domna domna left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are some comments on the eln data

Comment thread tests/data/dataconverter/readers/xps/eln_data.yaml
Comment thread pynxtools/dataconverter/readers/xps/reader.py
@lukaspie
lukaspie merged commit cdbe749 into master Jan 22, 2024
@lukaspie
lukaspie deleted the 206-xps-reader-nxmpes-update branch January 22, 2024 16:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

XPS reader: update to latest NXmpes standard

4 participants