Skip to content

Commit

Permalink
move new definitions to application and base_classes
Browse files Browse the repository at this point in the history
# Conflicts:
#	applications/NXellipsometry.nxdl.xml
#	applications/NXmpes_arpes.nxdl.xml
#	applications/NXoptical_spectroscopy.nxdl.xml
#	applications/NXraman.nxdl.xml
#	applications/NXxps.nxdl.xml
#	applications/xps/xps_cs.png
#	base_classes/NXactivity.nxdl.xml
#	base_classes/NXactuator.nxdl.xml
#	base_classes/NXapm_sim.nxdl.xml
#	base_classes/NXbeam_device.nxdl.xml
#	base_classes/NXbeam_transfer_matrix_table.nxdl.xml
#	base_classes/NXchemical_process.nxdl.xml
#	base_classes/NXcircuit.nxdl.xml
#	base_classes/NXcollectioncolumn.nxdl.xml
#	base_classes/NXcomponent.nxdl.xml
#	base_classes/NXcoordinate_system.nxdl.xml
#	base_classes/NXcrystal_structure.nxdl.xml
#	base_classes/NXdata_mpes.nxdl.xml
#	base_classes/NXdata_mpes_detector.nxdl.xml
#	base_classes/NXelectron_level.nxdl.xml
#	base_classes/NXem_correlation.nxdl.xml
#	base_classes/NXem_eds.nxdl.xml
#	base_classes/NXem_eels.nxdl.xml
#	base_classes/NXfabrication.nxdl.xml
#	base_classes/NXfit.nxdl.xml
#	base_classes/NXfit_background.nxdl.xml
#	base_classes/NXfit_function.nxdl.xml
#	base_classes/NXfit_parameter.nxdl.xml
#	base_classes/NXhistory.nxdl.xml
#	base_classes/NXidentifier.nxdl.xml
#	base_classes/NXmanipulator.nxdl.xml
#	base_classes/NXopt_window.nxdl.xml
#	base_classes/NXpeak.nxdl.xml
#	base_classes/NXphysical_process.nxdl.xml
#	base_classes/NXprocess_mpes.nxdl.xml
#	base_classes/NXresolution.nxdl.xml
#	base_classes/NXrotation_set.nxdl.xml
#	base_classes/NXsample_component_set.nxdl.xml
#	base_classes/NXserialized.nxdl.xml
#	base_classes/NXsingle_crystal.nxdl.xml
#	base_classes/NXspindispersion.nxdl.xml
#	base_classes/NXsubstance.nxdl.xml
#	base_classes/NXunit_cell.nxdl.xml
#	contributed_definitions/NXactivity.nxdl.xml
#	contributed_definitions/NXaperture_em.nxdl.xml
#	contributed_definitions/NXapm_sim.nxdl.xml
#	contributed_definitions/NXcomponent.nxdl.xml
#	contributed_definitions/NXcs_cpu_obj.nxdl.xml
#	contributed_definitions/NXcs_cpu_sys.nxdl.xml
#	contributed_definitions/NXcs_io_obj.nxdl.xml
#	contributed_definitions/NXcs_mm_obj.nxdl.xml
#	contributed_definitions/NXem_ebsd_crystal_structure_model.nxdl.xml
#	contributed_definitions/NXfit_function.nxdl.xml
#	contributed_definitions/NXfit_parameter.nxdl.xml
#	contributed_definitions/NXidentifier.nxdl.xml
#	contributed_definitions/NXms_ipf_set.nxdl.xml
#	contributed_definitions/NXunit_cell.nxdl.xml
#	contributed_definitions/nyaml/NXcg_primitive_set.yaml
#	contributed_definitions/nyaml/NXcoordinate_system.yaml
#	contributed_definitions/nyaml/NXcrystal_structure.yaml
#	contributed_definitions/nyaml/NXem_correlation.yaml
#	contributed_definitions/nyaml/NXem_eds.yaml
#	contributed_definitions/nyaml/NXem_eels.yaml
#	contributed_definitions/nyaml/NXem_img.yaml
#	contributed_definitions/nyaml/NXem_method.yaml
#	contributed_definitions/nyaml/NXem_msr.yaml
#	contributed_definitions/nyaml/NXem_sim.yaml
#	contributed_definitions/nyaml/NXroi.yaml
  • Loading branch information
lukaspie committed Dec 11, 2024
1 parent 5a68dbe commit 3cc5064
Show file tree
Hide file tree
Showing 70 changed files with 4 additions and 5,290 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
143 changes: 0 additions & 143 deletions base_classes/NXcoordinate_system.nxdl.xml

This file was deleted.

File renamed without changes.
Loading

0 comments on commit 3cc5064

Please sign in to comment.