-
Notifications
You must be signed in to change notification settings - Fork 56
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: small additions to NXsource #1407
FAIRmat 2024: small additions to NXsource #1407
Conversation
72bf9cb
to
d09e6cc
Compare
Proposal: accept changes with additions requested. Cannot merge until NXlens_em is reviewed. Accepted by vote in NIAC2024 |
… 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 # contributed_definitions/NXcollectioncolumn.nxdl.xml # contributed_definitions/NXmpes.nxdl.xml
# Conflicts: # base_classes/NXdetector.nxdl.xml # base_classes/NXinstrument.nxdl.xml # base_classes/NXsensor.nxdl.xml # base_classes/nyaml/NXdetector.yaml # base_classes/nyaml/NXinstrument.yaml # base_classes/nyaml/NXsensor.yaml # base_classes/nyaml/NXsource.yaml
# Conflicts: # base_classes/NXroot.nxdl.xml # contributed_definitions/NXmpes.nxdl.xml
# Conflicts: # base_classes/NXdata.nxdl.xml # base_classes/nyaml/NXdata.yaml # contributed_definitions/NXactuator.nxdl.xml # contributed_definitions/NXcalibration.nxdl.xml # contributed_definitions/NXelectronanalyser.nxdl.xml # contributed_definitions/NXresolution.nxdl.xml # contributed_definitions/nyaml/NXactuator.yaml # contributed_definitions/nyaml/NXcalibration.yaml # contributed_definitions/nyaml/NXelectronanalyser.yaml # contributed_definitions/nyaml/NXresolution.yaml # contributed_definitions/nyaml/NXsource.yaml
# Conflicts: # base_classes/nyaml/NXsource.yaml
# Conflicts: # base_classes/nyaml/NXsource.yaml
# Conflicts: # base_classes/nyaml/NXsource.yaml
# Conflicts: # base_classes/nyaml/NXsource.yaml
# Conflicts: # base_classes/nyaml/NXsource.yaml # contributed_definitions/NXdeflector.nxdl.xml # contributed_definitions/nyaml/NXdeflector.yaml
# Conflicts: # base_classes/nyaml/NXsource.yaml # contributed_definitions/NXdeflector.nxdl.xml # contributed_definitions/nyaml/NXdeflector.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/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/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/NXentry.yaml # base_classes/nyaml/NXenvironment.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 # contributed_definitions/nyaml/NXdetector.yaml # contributed_definitions/nyaml/NXinstrument.yaml
Co-authored-by: Aaron S. Brewster <[email protected]>
96ffad8
to
de3cbe5
Compare
In Note that in our current implementation,
Here, I am a bit stumped as to what the idea was. I discussed it a bit above in the comment itself.
Done. |
Comments from Telco:
Once the above is done, a simple review and merge can be done. No vote needed. |
Whoops, this one didn't need a vote. Comment deleted |
Thanks @phyy-nx for resolving and merging! |
This PR makes some changes to
NXsource
, mostly to expand the range of where it can be used and to what detail the source can be described:NXsource
is for any kind of radiation source, not just for neutron or x-ray storage ring/facilitiestypes
: LED, Laser, etc. with the possibility to specifytype_other
through an attribute ontype
probe
:photon
x-ray
orultraviolet
. Think survey scans in XPS as an example.NXaperture
,NXdeflector
,NXlens_em
(see discussion below),NXfabrication
previous_source