Skip to content

Mpes readd base classes - #53

Merged
sanbrock merged 9 commits into
fairmatfrom
mpes-readd-base-classes
Sep 5, 2023
Merged

Mpes readd base classes#53
sanbrock merged 9 commits into
fairmatfrom
mpes-readd-base-classes

Conversation

@domna

@domna domna commented Aug 16, 2023

Copy link
Copy Markdown

This readds the base classes removed in 843283a and 4b064d9

@mkuehbach @sanbrock Initially it did not work but I just checked the old file versions (from https://github.com/FAIRmat-NFDI/nexus_definitions/tree/ff35ff729aed3054e59c52e487fce3f54a30f1bb, which is the current reference in pynxtools==0.0.5) for NXaperture, NXdetector, NXmpes and, NXcollectioncolumn. This now passes the mpes examples without warning. Could be still that there are fields which we just don't use in the example. Could you check if I don't remove anything essential which was coming from NIAC? Other than that it should be fine from my side

@domna
domna requested review from mkuehbach and sanbrock August 16, 2023 10:13
@domna domna mentioned this pull request Aug 16, 2023

@mkuehbach mkuehbach left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Left a few comments to support why some of these base class changes were removed before the code camp, now the situation is tricky: Most what is here proposed I think is ready to go if not all but then we should strongly revise the changes later albeit that could have happened in between the code camp and until now, in the interest of the vacation keep the changes minimal but lets write down the commit here to be source to refactor it with fresh energy before the nexus code and especially with hopefully then area A feedback.

Comment thread base_classes/NXaperture.nxdl.xml Outdated
Comment thread base_classes/NXaperture.nxdl.xml Outdated
Comment thread base_classes/NXaperture.nxdl.xml
Comment thread base_classes/NXaperture.nxdl.xml
Comment thread base_classes/NXbeam.nxdl.xml Outdated
Comment thread base_classes/NXsample.nxdl.xml Outdated
Comment thread base_classes/NXsource.nxdl.xml Outdated
Comment thread contributed_definitions/NXcollectioncolumn.nxdl.xml Outdated
Comment thread contributed_definitions/NXmpes.nxdl.xml Outdated
Comment thread base_classes/NXsample.nxdl.xml Outdated
@mkuehbach

Copy link
Copy Markdown
Collaborator

The branch for this pull request was neither rebased against nor merged with 3b8f46a on fairmat.

@domna
domna force-pushed the mpes-readd-base-classes branch from b95a151 to 9db7a87 Compare August 16, 2023 13:26
@domna

domna commented Aug 16, 2023

Copy link
Copy Markdown
Author

The branch for this pull request was neither rebased against nor merged with 3b8f46a on fairmat.

Sorry, forgot this. It is rebased and still working with the example.

@domna

domna commented Aug 16, 2023

Copy link
Copy Markdown
Author

Left a few comments to support why some of these base class changes were removed before the code camp, now the situation is tricky: Most what is here proposed I think is ready to go if not all but then we should strongly revise the changes later albeit that could have happened in between the code camp and until now, in the interest of the vacation keep the changes minimal but lets write down the commit here to be source to refactor it with fresh energy before the nexus code and especially with hopefully then area A feedback.

I agree. I don't really have time to go through your comments. But let's keep them as a reference and have a more detailed discussion in #52 (I also added a comment there, that this here should be merged there, revisited and discussed)

@mkuehbach mkuehbach closed this Aug 16, 2023
@mkuehbach mkuehbach reopened this Aug 16, 2023
… version of yaml.

Removing unintensional comments
@lukaspie

lukaspie commented Aug 31, 2023

Copy link
Copy Markdown
Collaborator

Since we have substantial changes on the NXsample base class now, we should exclude any changes to NXsample from this PR. Next step is to refactor NXmpes to account for the new sample base class.

Aside from that, LGTM.

RubelMozumder and others added 4 commits August 31, 2023 15:12
Regeneration of the nexus file for fixing the changes coming from old…
Since we have substantial changes on the NXsample base class now, here we remove any changes to NXsample in this PR.
Comment thread base_classes/NXdetector.nxdl.xml
Comment thread base_classes/NXinstrument.nxdl.xml
@domna

domna commented Sep 5, 2023

Copy link
Copy Markdown
Author

This discussion will be continued in #52

@domna
domna requested a review from sanbrock September 5, 2023 08:03

@sanbrock sanbrock left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

As discussed, although the removal of these properties were accidental and need to merge now back, they shall be refactored and remodelled.

@sanbrock
sanbrock dismissed mkuehbach’s stale review September 5, 2023 09:14

review shall be continued in PR#52 where the refractoring will continue

@sanbrock
sanbrock merged commit a7bf1fd into fairmat Sep 5, 2023
@sanbrock
sanbrock deleted the mpes-readd-base-classes branch September 5, 2023 09:15
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.

6 participants