Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

XPS reader: update to new NXmpes after refactor #207

Merged
merged 95 commits into from
Jan 22, 2024
Merged

XPS reader: update to new NXmpes after refactor #207

merged 95 commits into from
Jan 22, 2024

Conversation

lukaspie
Copy link
Collaborator

@lukaspie lukaspie commented Jan 15, 2024 •
edited
Loading

  • 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
XPS reader: update to latest NXmpes standard #206
Closed
2 tasks
@coveralls
Copy link

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
Copy link

coveralls commented Jan 15, 2024 •
edited
Loading

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 and others added 22 commits January 15, 2024 17:33
@lukaspie
update definitions following MPES refactor
9fdad71
@lukaspie
remove comments from XPS SLE config file
c332433
@lukaspie
typo fix in sle specs XPS reader
ffb0d21
@lukaspie
add detector data reading in SLE XPS config
be523d0
@lukaspie
handle datetime writing in XPS reader
ea1cfdd
@lukaspie
temporary add old XPS config files
c78f831
@lukaspie
Merge branch '208-logger-level' into 206-xps-reader-nxmpes-update
0e6f541
@lukaspie
update XPS config template
837b104
@lukaspie
change commented SLE config file
ff69cd7
@lukaspie
revert changes to logger for now
525f5d9
@lukaspie
update definitions to mpes-fixes branch
b53dcb0
@domna
Updates definitions
781826b
@domna
Updates config file
26841e4
@domna
Use nested config file structure
872fa05
@domna
flatten_json cleaned up
9a3246b
@domna
Updates definitions
4d469fa
@domna
Renames DATA[data] to just data
6e56b02
@domna
Use beam_TYPE and source_TYPE
e72f25e
@domna
Add flag to reatin link dicts for flatten_json
fa4e27f
@domna
Properly resolve upper/lower case group fields
669dc52
@sherjeelshabih
Fixes a lookup error when keys have been filled in template with a di…
faa2792 
…fferent name
@sherjeelshabih
Fixes the case where the reader sends back a template entry with the …
7514c1d 
…concept name included
@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
View reviewed changes
Copy link
Collaborator

@domna domna left a comment

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

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

Still some failing tests

@domna
Copy link
Collaborator

domna commented Jan 22, 2024

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

domna
domna reviewed Jan 22, 2024
View reviewed changes
Copy link
Collaborator

@domna domna left a comment

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

tests/data/dataconverter/readers/xps/eln_data.yaml Show resolved Hide resolved
pynxtools/dataconverter/readers/xps/reader.py Show resolved Hide resolved
@lukaspie lukaspie merged commit cdbe749 into master Jan 22, 2024
5 checks passed
@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
Reviewers

@domna domna domna approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

XPS reader: update to latest NXmpes standard
4 participants
@lukaspie @coveralls @domna @sherjeelshabih