-
Notifications
You must be signed in to change notification settings - Fork 12
XPS reader: update to new NXmpes after refactor #207
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.
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
Merged
Merged
Changes from 84 commits
Commits
Show all changes
95 commits
Select commit
Hold shift + click to select a range
9f8fe41
Definitions upgraded to latest mpes-refactor
domna b86a5fe
Adapt vscode settings and update definitions, again
domna a0ca147
new default MPES template
lukaspie 0256281
initial change of XPS SLE config file
lukaspie aa55255
update submodules to recent mpes-refactor branch
lukaspie 9fdad71
update definitions following MPES refactor
lukaspie c332433
remove comments from XPS SLE config file
lukaspie ffb0d21
typo fix in sle specs XPS reader
lukaspie be523d0
add detector data reading in SLE XPS config
lukaspie ea1cfdd
handle datetime writing in XPS reader
lukaspie c78f831
temporary add old XPS config files
lukaspie 0e6f541
Merge branch '208-logger-level' into 206-xps-reader-nxmpes-update
lukaspie 837b104
update XPS config template
lukaspie ff69cd7
change commented SLE config file
lukaspie 525f5d9
revert changes to logger for now
lukaspie b53dcb0
update definitions to mpes-fixes branch
lukaspie 781826b
Updates definitions
domna 26841e4
Updates config file
domna 872fa05
Use nested config file structure
domna 9a3246b
flatten_json cleaned up
domna 4d469fa
Updates definitions
domna 6e56b02
Renames DATA[data] to just data
domna e72f25e
Use beam_TYPE and source_TYPE
domna fa4e27f
Add flag to reatin link dicts for flatten_json
domna 669dc52
Properly resolve upper/lower case group fields
domna faa2792
Fixes a lookup error when keys have been filled in template with a di…
sherjeelshabih 7514c1d
Fixes the case where the reader sends back a template entry with the …
sherjeelshabih fc4b034
Correct coeffs path for raw data file
domna 697a86d
add unit parsing to XPS SLE reader
lukaspie cb29980
Merge branch 'mpes-reader-update' into 206-xps-reader-nxmpes-update
lukaspie 920fb28
use nested config file in XPS SLE reader
lukaspie 0db2ddb
read nested configs in XPS reader
lukaspie 57a3900
Fix path in data dict test
domna c9142e9
Update mpes reference file
domna adb6926
Updates reference nexus log
domna 7c07f35
Merge branch 'master' into mpes-reader-update
domna 1b939a2
typo fixes in XPS file parser
lukaspie f890df0
Fix nexus regression file
domna d8a8b36
Don't use removeprefix to support py3.8
domna 96e40a1
Move pressure_gauge to correct location
domna efb56e8
Corrects link to pressure_gauge
domna 5b45780
Updates reference mpes test log
domna fa1db7d
Updates path for eln mapping
domna 27fe1b8
Fixes eln mapping
domna 343cd54
Skip test for xps reader
domna 79d845b
Fix typos
domna 9200ef3
Updates generated eln files
domna 5f25fb2
Fix undocumented @units if key is documented
domna eda5262
Updates mpes reference file
domna 9140ff3
Removed applied fields in calibrations
domna 5ba4f66
Removed photon_energies from source
domna 3a3f86f
Nest electronanalyser under instrument
domna 31f71fe
Use momentum_resolution and spatial_resolution as named concepts
domna e780737
Fix eln mapping for spatial and momentum resolution in electronanalyser
domna 44d94e7
Updates mpes reference file
domna 689a0ee
Renamings
domna 116f099
Renamings in NXsample
domna 279ba0e
Properly deal with undocumented @units as discussed w/ @sherjeelshabih
domna 3afb459
Updates mpes reference file
domna 3b04d23
Correctly map chemical formula
domna 591e87f
restructure xps sle config file
lukaspie 467b163
proper parsing of calibration data and transmission function
lukaspie e1f13c5
add @default to electronanalyser
lukaspie 73728f7
Adds additional mappings
domna e2cc867
remove detector test links from XPS config file
lukaspie bc521f8
major update to metadata parsing in basic XPS reader
lukaspie f0eb404
Merge branch 'mpes-reader-update' into 206-xps-reader-nxmpes-update
lukaspie b630d2e
mypy fixes
lukaspie 9eee7a3
correct parsing of XPS detector data
lukaspie 1c00dd5
link energy data from calibration data
lukaspie 52fdde4
proper writing of NXdata field in XPS reader
lukaspie 821fc07
remove unneeded config file
lukaspie f895a85
use beam_TYPE in config file
lukaspie 120d40c
make template config file nested
lukaspie c943452
update XPS reader convert dict
lukaspie 6d12f51
update config for XPS XY reader
lukaspie a92c78d
update XPS SLE config file
lukaspie 85a81a2
update SPECX XY config
lukaspie dc71664
update Scienta txt config
lukaspie 89632bf
add missed pre-commit fix
lukaspie ec84033
Allow Pathobject for json file path
domna d207d60
Merge branch 'master' into 206-xps-reader-nxmpes-update
domna 05a8755
Allow paths in `parse_flatten_json`, too
domna e669e40
Re-enable xps reader in tests
domna 741cea4
Fix mypy
domna 3ccdf04
Merge branch 'master' into 206-xps-reader-nxmpes-update
lukaspie 2aa1d74
Merge branch '206-xps-reader-nxmpes-update' of github.com:FAIRmat-NFD…
lukaspie 19cf050
update definitions
lukaspie 2032920
remove logger
lukaspie 8b970e3
update definitions to current fairmat branch
lukaspie 0d87135
mapping fix in XPS SLE reader
lukaspie 9c1290a
read analyser voltage range in XPS SLE reader
lukaspie 64212f4
update XPS xml reader and tests file
lukaspie 2f9242c
allow for direct parsing of energy from data field
lukaspie 2d0baa7
Fix energy reading in XPS reader
lukaspie File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| [submodule "pynxtools/definitions"] | ||
| path = pynxtools/definitions | ||
| url = https://github.com/FAIRmat-NFDI/nexus_definitions.git | ||
| branch = mpes-fixes | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| """Logger for pynxtools""" | ||
| # | ||
| # Copyright The NOMAD Authors. | ||
| # | ||
| # This file is part of NOMAD. See https://nomad-lab.eu for further info. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # | ||
|
|
||
| import logging | ||
|
lukaspie marked this conversation as resolved.
Outdated
|
||
|
|
||
| logger = logging.getLogger("pynxtools") | ||
|
|
||
| # Lowest level log allows to other levels erros, crittical, info and debug | ||
| logger.setLevel(logging.DEBUG) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
426 changes: 318 additions & 108 deletions
426
pynxtools/dataconverter/readers/xps/config/config_sle_specs.json
Large diffs are not rendered by default.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.