-
Notifications
You must be signed in to change notification settings - Fork 10
update definitions and change tools related to new NIAC ideas #578
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
Conversation
|
Also the chemical formula normalization needs to be updated |
We could do that together with #485 |
0428e2b to
9f5dcfe
Compare
547edd2 to
10f79e0
Compare
sanbrock
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
44d7651 to
e2cae1f
Compare
|
@rettigl since this will lead to additional warnings in the mpes reader, we can make the following workaround for now: the testing framework allows you to have a Essentially, the only things we need to change for now is that we change this line to and then we pass that file to the test data in the For the mpes reader, I imagine this can be an intermediate solution until the sibling inheritance works. For the raman reader, among others, this needs to be implemented. |
Is there actually a way to do this correctly? How would you specify which variadic field a field should inherit from, or if at all? I would say we only do this explicit inheritance by name, and otherwise just ignore a concept name for fields/attributes if the corresponding name is defined as well. |
As mentioned above, I would simply omitt the concept name if the instance name is literally defined on the same level, and issue an info. |
After merging FAIRmat-NFDI/nexus_definitions#361, mpes should pass now. One weird thing is that we still get from read_nexus: ENTRY/data/@energy_indices also does not have a docstring (we did not provide one in NXmpes, maybe should add). |
Well, we want
Do you wish to replace that in the template then? How would we do this? We cannot really do this in the MultiFormatReader because we don't handle the nxdl files there and so far, the validation only checks, it doesn't actually modify the template.
I see the issue if you have an instance name that matches that of a different class than what you give in the concept name. In my opinion, we should not blindly replace |
In this seperate PR (#591), I made it so that if you give a concept name and a name that matches with a non-variadic name on the same level, a warning is raised and class is written as undocumented. That is What do you think of this solution? Note that this currently blocks |
The |
b6f4894 to
4bce7ac
Compare
4bce7ac to
9ac4396
Compare
In the case of a partially variadic name, this might work, yes. But does it solve the DATA/AXISNAME issue? |
I think we don't need to replace anything, just accept that to fulfill a required field in the verification, no?
That is maybe the more proper solution, yes. |
I think this is a good idea. But maybe we only merge this after we have fixed the sibling inheritance issue, so that it does not break our tests? As we added now all relevant axes as named axes anyways, we can also remove the AXISNAME, and avoid the problem for now altogether. It anyways only shows up because of the flexibility with the "*" notation in the mpes reader to add whatever axes are present. |
|
Units inside NXcollection are still reported as undocumented:
|
|
My impression is that the validation has become much slower compared to earlier versions, I will try to verify this and see where the time is being spent. |
|
I also encountered a few times now the issue, that NX_FLOAT seems a bit restrictive. If I have e.g. from my machine metadata some field as int, which is supposed to be float, I suggest that we do a conversion in that case, rather than issuing a warning. |
Should be okay now, can you double check, please? Are you happy with the branch for now? We would like to make a new pynxtools release either today or tomorrow, because Christoph needs a new version for a conferene. I suggest we merge this first, then we check for further improvements after the release. |
|
After discussion with @sanbrock and @mkuehbach, we merge here to get closer to a new release. Will review sibling inheritance as well as several other issues after the release is made. |
fairmatnameTyperead_nexusread_nexusread_nexus