Fairmat 2024: add attributes to NXroot#1418
Merged
lukaspie merged 18 commits intonexusformat:mainfrom Oct 22, 2024
Merged
Conversation
# Conflicts: # base_classes/NXroot.nxdl.xml # base_classes/NXsource.nxdl.xml # contributed_definitions/NXmpes.nxdl.xml
# Conflicts: # base_classes/NXsource.nxdl.xml # base_classes/nyaml/NXroot.yaml # base_classes/nyaml/NXsource.yaml # contributed_definitions/NXcalibration.nxdl.xml # contributed_definitions/NXenergydispersion.nxdl.xml # contributed_definitions/NXmpes.nxdl.xml # contributed_definitions/NXresolution.nxdl.xml # contributed_definitions/nyaml/NXcalibration.yaml # contributed_definitions/nyaml/NXenergydispersion.yaml # contributed_definitions/nyaml/NXmpes.yaml # contributed_definitions/nyaml/NXphotoemission.yaml # contributed_definitions/nyaml/NXresolution.yaml
# Conflicts: # base_classes/NXroot.nxdl.xml # base_classes/nyaml/NXroot.yaml
… removes nyaml2nxdl (#117) * Readd collapsible features * Restore super-concept links * Remove nyaml2nxdl * Use nyaml package * Readd pyyaml # Conflicts: # Makefile # contributed_definitions/NXcalibration.nxdl.xml # dev_tools/utils/nxdl_utils.py # requirements.txt
# Conflicts: # contributed_definitions/NXcg_primitive_set.nxdl.xml # contributed_definitions/NXcollectioncolumn.nxdl.xml # contributed_definitions/NXcomponent_em.nxdl.xml # contributed_definitions/NXcoordinate_system.nxdl.xml # contributed_definitions/NXcrystal_structure.nxdl.xml # contributed_definitions/NXcs_cpu_obj.nxdl.xml # contributed_definitions/NXcs_cpu_sys.nxdl.xml # contributed_definitions/NXcs_gpu_obj.nxdl.xml # contributed_definitions/NXcs_gpu_sys.nxdl.xml # contributed_definitions/NXcs_mm_obj.nxdl.xml # contributed_definitions/NXelectronanalyser.nxdl.xml # contributed_definitions/NXem_adf.nxdl.xml # contributed_definitions/NXem_base.nxdl.xml # contributed_definitions/NXem_conventions_ebsd.nxdl.xml # contributed_definitions/NXem_correlation.nxdl.xml # contributed_definitions/NXem_eds.nxdl.xml # contributed_definitions/NXem_eels.nxdl.xml # contributed_definitions/NXem_img.nxdl.xml # contributed_definitions/NXem_method.nxdl.xml # contributed_definitions/NXem_msr.nxdl.xml # contributed_definitions/NXem_sim.nxdl.xml # contributed_definitions/NXenergydispersion.nxdl.xml # contributed_definitions/NXidentifier.nxdl.xml # contributed_definitions/NXimage_c_set.nxdl.xml # contributed_definitions/NXimage_r_set.nxdl.xml # contributed_definitions/NXimage_r_set_diff.nxdl.xml # contributed_definitions/NXinteraction_vol_em.nxdl.xml # contributed_definitions/NXmpes.nxdl.xml # contributed_definitions/NXms_ipf.nxdl.xml # contributed_definitions/NXms_ipf_set.nxdl.xml # contributed_definitions/NXms_mtex_config.nxdl.xml # contributed_definitions/NXms_odf.nxdl.xml # contributed_definitions/NXms_odf_set.nxdl.xml # contributed_definitions/NXms_pf.nxdl.xml # contributed_definitions/NXms_pf_set.nxdl.xml # contributed_definitions/NXms_recon.nxdl.xml # contributed_definitions/NXroi.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXserialized.nxdl.xml # contributed_definitions/NXxrd.nxdl.xml # contributed_definitions/NXxrd_pan.nxdl.xml
# Conflicts: # contributed_definitions/NXcg_primitive_set.nxdl.xml # contributed_definitions/NXcomponent_em.nxdl.xml # contributed_definitions/NXcoordinate_system.nxdl.xml # contributed_definitions/NXcrystal_structure.nxdl.xml # contributed_definitions/NXcs_cpu_obj.nxdl.xml # contributed_definitions/NXcs_cpu_sys.nxdl.xml # contributed_definitions/NXcs_gpu_obj.nxdl.xml # contributed_definitions/NXcs_gpu_sys.nxdl.xml # contributed_definitions/NXcs_mm_obj.nxdl.xml # contributed_definitions/NXem_adf.nxdl.xml # contributed_definitions/NXem_base.nxdl.xml # contributed_definitions/NXem_conventions_ebsd.nxdl.xml # contributed_definitions/NXem_correlation.nxdl.xml # contributed_definitions/NXem_eds.nxdl.xml # contributed_definitions/NXem_eels.nxdl.xml # contributed_definitions/NXem_img.nxdl.xml # contributed_definitions/NXem_method.nxdl.xml # contributed_definitions/NXem_msr.nxdl.xml # contributed_definitions/NXem_sim.nxdl.xml # contributed_definitions/NXidentifier.nxdl.xml # contributed_definitions/NXimage_c_set.nxdl.xml # contributed_definitions/NXimage_r_set.nxdl.xml # contributed_definitions/NXimage_r_set_diff.nxdl.xml # contributed_definitions/NXinteraction_vol_em.nxdl.xml # contributed_definitions/NXms_ipf.nxdl.xml # contributed_definitions/NXms_ipf_set.nxdl.xml # contributed_definitions/NXms_mtex_config.nxdl.xml # contributed_definitions/NXms_odf.nxdl.xml # contributed_definitions/NXms_odf_set.nxdl.xml # contributed_definitions/NXms_pf.nxdl.xml # contributed_definitions/NXms_pf_set.nxdl.xml # contributed_definitions/NXms_recon.nxdl.xml # contributed_definitions/NXroi.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXserialized.nxdl.xml # contributed_definitions/NXxrd.nxdl.xml # contributed_definitions/NXxrd_pan.nxdl.xml
…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/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
update copyright
Closed
Closed
phyy-nx
reviewed
Sep 30, 2024
phyy-nx
reviewed
Sep 30, 2024
phyy-nx
reviewed
Sep 30, 2024
phyy-nx
reviewed
Sep 30, 2024
phyy-nx
reviewed
Sep 30, 2024
Contributor
|
Proposal: accept with the noted changes. Accepted by NIAC vote as part of NIAC2024 |
This was referenced Oct 1, 2024
Contributor
Author
|
@sanbrock this should be more or less ready. Feel free to give a final review before other NIAC members can be tagged in. |
PeterC-DLS
reviewed
Oct 18, 2024
PeterC-DLS
reviewed
Oct 18, 2024
Co-authored-by: Peter Chang <peter.chang@diamond.ac.uk>
PeterC-DLS
reviewed
Oct 22, 2024
Co-authored-by: Peter Chang <peter.chang@diamond.ac.uk>
This was referenced Mar 6, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.