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: add NXpositioner, shape, and size to NXaperture #1409

Merged
merged 10 commits into from
Sep 29, 2024

Conversation

lukaspie
Copy link
Contributor

No description provided.

domna and others added 6 commits September 23, 2024 16:52
# Conflicts:
#	base_classes/NXaperture.nxdl.xml
# Conflicts:
#	base_classes/NXdetector.nxdl.xml
… version of yaml.

Removing unintensional comments

# Conflicts:
#	base_classes/NXbeam.nxdl.xml
#	base_classes/NXdetector.nxdl.xml
#	base_classes/NXentry.nxdl.xml
#	base_classes/NXinstrument.nxdl.xml
#	base_classes/NXprocess.nxdl.xml
#	base_classes/NXsample.nxdl.xml
#	base_classes/NXsource.nxdl.xml
…ersion

# Conflicts:
#	applications/NXarpes.nxdl.xml
#	applications/nyaml/NXarpes.yaml
#	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/NXmonochromator.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-nxaperture branch from 5c5d0fe to e28a739 Compare September 23, 2024 14:55
@sanbrock sanbrock mentioned this pull request Sep 26, 2024
@phyy-nx
Copy link
Contributor

phyy-nx commented Sep 29, 2024

Needs corrections @mkuehbach, thanks

@lukaspie lukaspie linked an issue Sep 29, 2024 that may be closed by this pull request
@phyy-nx
Copy link
Contributor

phyy-nx commented Sep 29, 2024

Changes accepted by NIAC vote as part of NIAC2024

@lukaspie lukaspie merged commit 56e3ce5 into nexusformat:main Sep 29, 2024
2 checks passed
@lukaspie lukaspie deleted the fairmat-2024-nxaperture branch September 29, 2024 12:56
@prjemian prjemian added this to the NXDL 2025 milestone Sep 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: No status
Development

Successfully merging this pull request may close these issues.

NXaperture
6 participants