No inner sections #525
Merged
No inner sections #525
Conversation
This file contains 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
…nt as the field value
…able quantity <name>
lukaspie
requested changes
Feb 13, 2025
src/pynxtools/nomad/schema.py
Outdated
Comment on lines
161
to
173
| for sec in entry.m_all_contents(): | ||
| if isinstance(sec, ActivityStep): | ||
| sec_c = sec.m_copy() | ||
| self.steps.append(sec_c) | ||
| ref = NexusActivityStep(name=sec.name, reference=sec) | ||
| self.steps.append(ref) | ||
| elif isinstance(sec, basesections.Instrument): | ||
| ref = InstrumentReference(name=sec.name) | ||
| ref.reference = sec | ||
| ref = InstrumentReference(name=sec.name, reference=sec) | ||
| self.instruments.append(ref) | ||
| elif isinstance(sec, CompositeSystem): | ||
| ref = CompositeSystemReference(name=sec.name) | ||
| ref.reference = sec | ||
| ref = CompositeSystemReference(name=sec.name, reference=sec) | ||
| self.samples.append(ref) | ||
| elif isinstance(sec, ActivityResult): | ||
| sec_c = sec.m_copy() | ||
| self.results.append(sec_c) | ||
| ref = NexusActivityResult(name=sec.name, reference=sec) | ||
| self.results.append(ref) |
There was a problem hiding this comment.
Suggestion to use a mapping
mapping = {
ActivityStep: (NexusActivityStep, self.steps),
basesections.Instrument: (InstrumentReference, self.instruments),
CompositeSystem: (CompositeSystemReference, self.samples),
ActivityResult: (NexusActivityResult, self.results),
}
for sec in entry.m_all_contents():
for cls, (ref_cls, collection) in mapping.items():
if isinstance(sec, cls):
collection.append(ref_cls(name=sec.name, reference=sec))
break
Co-authored-by: Lukas Pielsticker <[email protected]>
Co-authored-by: Lukas Pielsticker <[email protected]>
rettigl
reviewed
Feb 13, 2025
|
With latest version of nomad/develop and this branch, I get a number of parsing errors for the mpes example data: It can however be that these files indeed don't adhere to the NXmpes standard. |
…into no_inner_sections
lukaspie
approved these changes
Feb 14, 2025
| @@ -34,7 +34,7 @@ jobs: | |||
| curl -LsSf https://astral.sh/uv/install.sh | sh | |||
| uv pip install coverage coveralls | |||
| - name: Install nomad | |||
| if: "${{ matrix.python_version != '3.8'}}" | |||
There was a problem hiding this comment.
I think at some point we should just drop support for python<3.10, like NOMAD did. I can do this in a separate PR.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.