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.

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

Fairmat 2024: additional fields in NXmonochromator #1417

Merged
merged 8 commits into from
Oct 18, 2024

Conversation

lukaspie
Copy link
Contributor

No description provided.

@sanbrock sanbrock mentioned this pull request Sep 29, 2024
@lukaspie lukaspie linked an issue Sep 29, 2024 that may be closed by this pull request
@prjemian
Copy link
Contributor

prjemian commented Sep 29, 2024 via email

@phyy-nx
Copy link
Contributor

phyy-nx commented Sep 30, 2024

Approved by NIAC vote, given the unit fixes listed above, in NIAC 2024

@lukaspie
Copy link
Contributor Author

lukaspie commented Oct 4, 2024

@sanbrock ready for review before other NIAC member can review.

# Conflicts:
#	base_classes/NXmonochromator.nxdl.xml
#	base_classes/nyaml/NXmonochromator.yaml
# Conflicts:
#	base_classes/nyaml/NXmonochromator.yaml
# Conflicts:
#	base_classes/nyaml/NXmonochromator.yaml
# Conflicts:
#	base_classes/NXbeam.nxdl.xml
#	base_classes/nyaml/NXbeam.yaml
#	base_classes/nyaml/NXmonochromator.yaml
…ersion

# Conflicts:
#	applications/NXarpes.nxdl.xml
#	applications/nyaml/NXarpes.yaml
#	base_classes/NXaperture.nxdl.xml
#	base_classes/NXbeam.nxdl.xml
#	base_classes/NXdata.nxdl.xml
#	base_classes/NXdetector.nxdl.xml
#	base_classes/NXentry.nxdl.xml
#	base_classes/NXenvironment.nxdl.xml
#	base_classes/NXinstrument.nxdl.xml
#	base_classes/NXroot.nxdl.xml
#	base_classes/NXsample.nxdl.xml
#	base_classes/NXsample_component.nxdl.xml
#	base_classes/NXsensor.nxdl.xml
#	base_classes/NXsource.nxdl.xml
#	base_classes/NXsubentry.nxdl.xml
#	base_classes/NXtransformations.nxdl.xml
#	base_classes/NXuser.nxdl.xml
#	base_classes/nyaml/NXaperture.yaml
#	base_classes/nyaml/NXbeam.yaml
#	base_classes/nyaml/NXdata.yaml
#	base_classes/nyaml/NXdetector.yaml
#	base_classes/nyaml/NXentry.yaml
#	base_classes/nyaml/NXenvironment.yaml
#	base_classes/nyaml/NXinstrument.yaml
#	base_classes/nyaml/NXmonochromator.yaml
#	base_classes/nyaml/NXprocess.yaml
#	base_classes/nyaml/NXroot.yaml
#	base_classes/nyaml/NXsample.yaml
#	base_classes/nyaml/NXsample_component.yaml
#	base_classes/nyaml/NXsensor.yaml
#	base_classes/nyaml/NXsource.yaml
#	base_classes/nyaml/NXsubentry.yaml
#	base_classes/nyaml/NXtransformations.yaml
#	base_classes/nyaml/NXuser.yaml
@lukaspie lukaspie force-pushed the fairmat-2024-nxmonochromator branch from 2fe1203 to 5542cd2 Compare October 16, 2024 08:16
Copy link
Contributor

@PeterC-DLS PeterC-DLS left a comment

Choose a reason for hiding this comment

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

LGTM

@lukaspie lukaspie merged commit a12a91b into nexusformat:main Oct 18, 2024
2 checks passed
@lukaspie lukaspie deleted the fairmat-2024-nxmonochromator branch October 18, 2024 08:25
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.

NXmonochromator
5 participants