Fairmat 2024: base classes to describe computational geometry #1421
Conversation
This file contains 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
* Refactored cg_primitive base classes for two key aspects: i) make all primitives inherit from new base class NXcg_primitive_set which makes a substantial number of repeated properties of specialized primitive base classes unnecessary, ii) introducing a rigorous mathematical set theoretical approach to describe the number type N, N0, Z, R, R+, R, iii) introduce short hand notation to reduce writing costs for shape/dimensions of arrays: now numpy syntax is used, for scalars (), (1, can be omitted, experience in FAIRmat has shown that in almost all cases the optional doc string to a dimension was almost never used and thus yaml based descriptions can be written more succinct, iv) proof-read docstrings and shortened them, introduced the suggestion to use info: as a keyword which should for now be just appended to the docstring as usual but in the future should be treated as a comment, i.e. only meant for human contextualization but ignored for semantic interpretation of concepts, a key difference that I hope this will bring is to reduce also the length of base classes and appdef as they show up in html pages, specifically for appdefs like NXem many of the conceptual ideas which these docstrings currently contain would be much better placed in a proper documentation instead of the actual class definition in the hope that the overall appearance of classes becomes easier and faster for people to power read; maybe this also works against some criticism that NeXus is considered complex, I have to say with the outsourcing of NXcg_primitive_set I feel it is damn simple now * Refactoring of NXcs base classes * First lot of refactoring EM base classes, the rest tomorrow, NXapm will not be refactored before the APT&M2023 conference in Sept2023, also because feedback from Leoben was positive enough that no immediate changes wrt to appdefs and base classes were required * Summarize the current state of the discussion about coordinate systems with the proposed NXcoordinate_system and NXcoordinate_system_set base classes and best practice recommendations how they should be used including feedback from discussions with Florian Dobner and Tamás Haraszti * Summary of the discussion how to handle conventions and method-specific conventions for EM and methods used in EM * Base classes for implemented examples for pole figures, orientation distribution function, event_data, stage_lab, and ebsd_crystal_structure_model * NXms_ipf base class and dos2unix to correct newlines * Introducing NXem_method base class as a template how to write method-specific deep base classes to describe the terms and taxononmy of method-specific branches to be hooked into appdefs like NXem * Base class inheritance proposal for a now even stronger modularized schema set for electron microscopy research, two tasks remain: i) refactor what is now a method-specific instance rather than an appdef (NXem_ebsd) (mainly to be able to fuse all examples of em-specific data converters including new ebsd examples into one em parser for pynxtools), ii) refactor NXem which is now clearly a specific appdef specializing the NXem_base deep base class, specialization work needs to define which fields and groups from all the possible ones now composable via base classes (inheritance) are required in an appdef NXem for NOMAD OASIS * NXem_ebsd refactored into a base class to use it as a method-specific group inside the NXem application definition, next step: i) refactor NXem_sim, ii) finalize refactoring of NXem appdef (for Nomad oasis) * finished draft of NXem_ebsd, NXem_correlation, and NXem appdef, cleaning the branch * Add proposal for storing mtx cfg, fixed nxtime datatypes * 2d microstructure projection * Inspection how proposed, info, N0, N, R, Z value type abbreviations, and dimensions could be added to nyamlforward * A likely too simplistic but at least working nyaml2nxdl forward mapping to explore further usage of refactored EM base classes. Info keyword has to be a child of doc or the respective text be removed from the standard and put into proposal-specific documentation, how to store what and where so that the schema docstring remain succinct and slim but all these conceptual ideas get not forgotten, typically the would be part of a tech report, i.e. in my opinion all what is under info: sections of a docstring should move to some documentation to tell the story to humans, next test these NXDLs with the NeXus documentation system * Minor fix to handle info keyword spotted while compiling the documentation * Fixes to compile with NeXus documentation test suite and sphinx * Deactivated the annoying clean yaml via make clean for dev purposes * Minor fix in em_base, this completes the appdef/base class work for now on the refactored EM, there are still some spurious info fields now, which should be removed when a decision has been made wrt to how to deal with info: keyword fields in general, next steps: i) make decision on info, ii) test refactored EM proposal with pynxtools em-parser v2, iii) implement backwards * Styling via black * Added yaml2nxdl-forward-converted NXDL files to all refactored base classes and the refactored NXem * Added NXroot header for the em appdef and its base template appdef * Continuing the refactoring of EM and APM plus related base classes for CG and MS based on suggestions from user meetings, discussions with Sandor, represents work with the MPES sprint #83 * Continuing on #83 * Continuing #83, NXcs_* * Continuing #83, ipf, pf, odf * Continuing on #83, support classes for EM * Continued on #83, coordinate system, further base classes supporting EM * Continuing #83, event_data_set and event_data description substantially condensed amongst other points * Added cross-references to base classes for rst, continuing #83 * Aligned old NXem_ebsd_conventions with NXcoordinate_system for #83 * Reviewed method-specific base classes, ebsd, eds, eels, #83 * #83, NXms_recon * #83, composed constraints on the NXem appdef * Consolidated with changes that happened in between on the fairmat branch based on 1016aa0, NXms_recon has still an issue and is therefore deactivated currently, method-specific landing pages need to be updated * Consolidated further with fairmat 15624c0 * Fixing some missing references * Fixed syntax error to compile NXms_recon, docs building also now, reviewing intro pages remains * Consistencies of dimensionality to use NX_POSINT and an enumeration * Recompiled NXDL files using new nyaml module 3d500ced7e4ca57683957c1d61a8d0cb62eccf53, removed, modified by taking the one from fairmat, and synced all files which were binarily different between this feature branch and the fairmat branch specifically commit a15798b of the fairmat branch * Deactivated em-based tests which because of a refactoring of em are not expected to work anymore * Fix improper Latex notation in math environment for polyline, face_list, nanochem * Added recompiled NXidentifier, NXserialized NXDLs which triggered pipeline errors in CatChen gh action * Some round of proof-reading * Fixed test_nxdl_utils to reflect and use refactored locations of refactored NXem * Added feedback from @phyy-nx, @PeterC-DLS, and @prjemian from discussed here https://github.com/nexusformat/definitions PR nexusformat#1271 * Black formatting * Reactivated data type check for e.g. NXem NX_NUMBER * Implementing NX_DATE_TIME suggestion of @sanbrock --------- Co-authored-by: markus.kuehbach <[email protected]> # Conflicts: # contributed_definitions/NXaberration.nxdl.xml # contributed_definitions/NXaberration_model.nxdl.xml # contributed_definitions/NXaberration_model_ceos.nxdl.xml # contributed_definitions/NXaberration_model_nion.nxdl.xml # contributed_definitions/NXaperture_em.nxdl.xml # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXapm_paraprobe_results_nanochem.nxdl.xml # contributed_definitions/NXcg_alpha_complex.nxdl.xml # contributed_definitions/NXcg_cylinder_set.nxdl.xml # contributed_definitions/NXcg_ellipsoid_set.nxdl.xml # contributed_definitions/NXcg_face_list_data_structure.nxdl.xml # contributed_definitions/NXcg_geodesic_mesh.nxdl.xml # contributed_definitions/NXcg_grid.nxdl.xml # contributed_definitions/NXcg_half_edge_data_structure.nxdl.xml # contributed_definitions/NXcg_hexahedron_set.nxdl.xml # contributed_definitions/NXcg_marching_cubes.nxdl.xml # contributed_definitions/NXcg_parallelogram_set.nxdl.xml # contributed_definitions/NXcg_point_set.nxdl.xml # contributed_definitions/NXcg_polygon_set.nxdl.xml # contributed_definitions/NXcg_polyhedron_set.nxdl.xml # contributed_definitions/NXcg_polyline_set.nxdl.xml # contributed_definitions/NXcg_roi_set.nxdl.xml # contributed_definitions/NXcg_sphere_set.nxdl.xml # contributed_definitions/NXcg_tetrahedron_set.nxdl.xml # contributed_definitions/NXcg_triangle_set.nxdl.xml # contributed_definitions/NXcg_triangulated_surface_mesh.nxdl.xml # contributed_definitions/NXcg_unit_normal_set.nxdl.xml # contributed_definitions/NXchamber.nxdl.xml # contributed_definitions/NXcoordinate_system_set.nxdl.xml # contributed_definitions/NXcorrector_cs.nxdl.xml # contributed_definitions/NXcs_computer.nxdl.xml # contributed_definitions/NXcs_filter_boolean_mask.nxdl.xml # contributed_definitions/NXcs_io_obj.nxdl.xml # contributed_definitions/NXcs_io_sys.nxdl.xml # contributed_definitions/NXcs_mm_sys.nxdl.xml # contributed_definitions/NXcs_prng.nxdl.xml # contributed_definitions/NXcs_profiling.nxdl.xml # contributed_definitions/NXcs_profiling_event.nxdl.xml # contributed_definitions/NXdeflector.nxdl.xml # contributed_definitions/NXebeam_column.nxdl.xml # contributed_definitions/NXem.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_ebsd.nxdl.xml # contributed_definitions/NXem_ebsd_crystal_structure_model.nxdl.xml # contributed_definitions/NXevent_data_em.nxdl.xml # contributed_definitions/NXevent_data_em_set.nxdl.xml # contributed_definitions/NXfabrication.nxdl.xml # contributed_definitions/NXgraph_edge_set.nxdl.xml # contributed_definitions/NXgraph_node_set.nxdl.xml # contributed_definitions/NXgraph_root.nxdl.xml # contributed_definitions/NXibeam_column.nxdl.xml # contributed_definitions/NXimage_set.nxdl.xml # contributed_definitions/NXimage_set_em_adf.nxdl.xml # contributed_definitions/NXimage_set_em_kikuchi.nxdl.xml # contributed_definitions/NXion.nxdl.xml # contributed_definitions/NXisocontour.nxdl.xml # contributed_definitions/NXlens_em.nxdl.xml # contributed_definitions/NXms.nxdl.xml # contributed_definitions/NXms_feature_set.nxdl.xml # contributed_definitions/NXms_score_results.nxdl.xml # contributed_definitions/NXoptical_system_em.nxdl.xml # contributed_definitions/NXorientation_set.nxdl.xml # contributed_definitions/NXpump.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXscanbox_em.nxdl.xml # contributed_definitions/NXspectrum_set.nxdl.xml # contributed_definitions/NXspectrum_set_em_eels.nxdl.xml # contributed_definitions/NXspectrum_set_em_xray.nxdl.xml # contributed_definitions/NXstage_lab.nxdl.xml # contributed_definitions/nyaml/NXaberration.yaml # contributed_definitions/nyaml/NXaberration_model.yaml # contributed_definitions/nyaml/NXaberration_model_ceos.yaml # contributed_definitions/nyaml/NXaberration_model_nion.yaml # contributed_definitions/nyaml/NXaperture_em.yaml # contributed_definitions/nyaml/NXapm.yaml # contributed_definitions/nyaml/NXapm_paraprobe_results_nanochem.yaml # contributed_definitions/nyaml/NXcg_alpha_complex.yaml # contributed_definitions/nyaml/NXcg_cylinder_set.yaml # contributed_definitions/nyaml/NXcg_ellipsoid_set.yaml # contributed_definitions/nyaml/NXcg_face_list_data_structure.yaml # contributed_definitions/nyaml/NXcg_geodesic_mesh.yaml # contributed_definitions/nyaml/NXcg_grid.yaml # contributed_definitions/nyaml/NXcg_half_edge_data_structure.yaml # contributed_definitions/nyaml/NXcg_hexahedron_set.yaml # contributed_definitions/nyaml/NXcg_marching_cubes.yaml # contributed_definitions/nyaml/NXcg_parallelogram_set.yaml # contributed_definitions/nyaml/NXcg_point_set.yaml # contributed_definitions/nyaml/NXcg_polygon_set.yaml # contributed_definitions/nyaml/NXcg_polyhedron_set.yaml # contributed_definitions/nyaml/NXcg_polyline_set.yaml # contributed_definitions/nyaml/NXcg_roi_set.yaml # contributed_definitions/nyaml/NXcg_sphere_set.yaml # contributed_definitions/nyaml/NXcg_tetrahedron_set.yaml # contributed_definitions/nyaml/NXcg_triangle_set.yaml # contributed_definitions/nyaml/NXcg_triangulated_surface_mesh.yaml # contributed_definitions/nyaml/NXcg_unit_normal_set.yaml # contributed_definitions/nyaml/NXchamber.yaml # contributed_definitions/nyaml/NXcoordinate_system_set.yaml # contributed_definitions/nyaml/NXcorrector_cs.yaml # contributed_definitions/nyaml/NXcs_computer.yaml # contributed_definitions/nyaml/NXcs_filter_boolean_mask.yaml # contributed_definitions/nyaml/NXcs_io_obj.yaml # contributed_definitions/nyaml/NXcs_io_sys.yaml # contributed_definitions/nyaml/NXcs_mm_sys.yaml # contributed_definitions/nyaml/NXcs_prng.yaml # contributed_definitions/nyaml/NXcs_profiling.yaml # contributed_definitions/nyaml/NXcs_profiling_event.yaml # contributed_definitions/nyaml/NXdeflector.yaml # contributed_definitions/nyaml/NXebeam_column.yaml # contributed_definitions/nyaml/NXem.yaml # contributed_definitions/nyaml/NXem_ebsd.yaml # contributed_definitions/nyaml/NXevent_data_em.yaml # contributed_definitions/nyaml/NXevent_data_em_set.yaml # contributed_definitions/nyaml/NXfabrication.yaml # contributed_definitions/nyaml/NXgraph_edge_set.yaml # contributed_definitions/nyaml/NXgraph_node_set.yaml # contributed_definitions/nyaml/NXgraph_root.yaml # contributed_definitions/nyaml/NXibeam_column.yaml # contributed_definitions/nyaml/NXimage_set.yaml # contributed_definitions/nyaml/NXinteraction_vol_em.yaml # contributed_definitions/nyaml/NXion.yaml # contributed_definitions/nyaml/NXisocontour.yaml # contributed_definitions/nyaml/NXlens_em.yaml # contributed_definitions/nyaml/NXms.yaml # contributed_definitions/nyaml/NXms_feature_set.yaml # contributed_definitions/nyaml/NXms_score_results.yaml # contributed_definitions/nyaml/NXoptical_system_em.yaml # contributed_definitions/nyaml/NXpump.yaml # contributed_definitions/nyaml/NXrotation_set.yaml # contributed_definitions/nyaml/NXscanbox_em.yaml # contributed_definitions/nyaml/NXspectrum_set.yaml # contributed_definitions/nyaml/NXstage_lab.yaml # dev_tools/tests/test_nxdl_utils.py # manual/source/classes/contributed_definitions/cgms-structure.rst # manual/source/classes/contributed_definitions/em-structure.rst # manual/source/classes/contributed_definitions/icme-structure.rst
# Conflicts: # base_classes/NXroot.nxdl.xml # contributed_definitions/NXcollectioncolumn.nxdl.xml # contributed_definitions/NXelectronanalyser.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXenergydispersion.nxdl.xml # contributed_definitions/NXidentifier.nxdl.xml # contributed_definitions/NXmpes.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: # base_classes/NXroot.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXidentifier.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXserialized.nxdl.xml # contributed_definitions/NXxrd.nxdl.xml # contributed_definitions/NXxrd_pan.nxdl.xml
…s 0572bfa9df6f513325024185ed1f1c1901d0758c # Conflicts: # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXapm_charge_state_analysis.nxdl.xml # contributed_definitions/NXapm_hit_finding.nxdl.xml # contributed_definitions/NXapm_msr.nxdl.xml # contributed_definitions/NXapm_paraprobe_ranger_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_ranger_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tool_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_tool_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_transcoder_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_transcoder_results.nxdl.xml # contributed_definitions/NXapm_ranging.nxdl.xml # contributed_definitions/NXapm_reconstruction.nxdl.xml # contributed_definitions/NXapm_sim.nxdl.xml # contributed_definitions/NXapm_volt_and_bowl.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXevent_data_apm.nxdl.xml # contributed_definitions/NXevent_data_apm_set.nxdl.xml # contributed_definitions/NXidentifier.nxdl.xml # contributed_definitions/NXpeak.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXserialized.nxdl.xml # contributed_definitions/NXxrd.nxdl.xml # contributed_definitions/NXxrd_pan.nxdl.xml # contributed_definitions/nyaml/NXapm.yaml # contributed_definitions/nyaml/NXapm_charge_state_analysis.yaml # contributed_definitions/nyaml/NXapm_hit_finding.yaml # contributed_definitions/nyaml/NXapm_ranging.yaml # contributed_definitions/nyaml/NXapm_reconstruction.yaml # contributed_definitions/nyaml/NXapm_volt_and_bowl.yaml # contributed_definitions/nyaml/NXevent_data_apm.yaml # contributed_definitions/nyaml/NXpeak.yaml
# Conflicts: # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXapm_charge_state_analysis.nxdl.xml # contributed_definitions/NXapm_hit_finding.nxdl.xml # contributed_definitions/NXapm_paraprobe_clusterer_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_clusterer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_distancer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_intersector_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_intersector_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_nanochem_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_nanochem_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_ranger_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_selector_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_spatstat_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_spatstat_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_surfacer_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_surfacer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tessellator_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tool_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_transcoder_results.nxdl.xml # contributed_definitions/NXapm_ranging.nxdl.xml # contributed_definitions/NXapm_reconstruction.nxdl.xml # contributed_definitions/NXapm_volt_and_bowl.nxdl.xml # contributed_definitions/NXcg_alpha_complex.nxdl.xml # contributed_definitions/NXcg_cylinder_set.nxdl.xml # contributed_definitions/NXcg_face_list_data_structure.nxdl.xml # contributed_definitions/NXcg_grid.nxdl.xml # contributed_definitions/NXcg_half_edge_data_structure.nxdl.xml # contributed_definitions/NXcg_hexahedron_set.nxdl.xml # contributed_definitions/NXcg_parallelogram_set.nxdl.xml # contributed_definitions/NXcg_point_set.nxdl.xml # contributed_definitions/NXcorrector_cs.nxdl.xml # contributed_definitions/NXdelocalization.nxdl.xml # contributed_definitions/NXem_base.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_ebsd.nxdl.xml # contributed_definitions/NXem_eds.nxdl.xml # contributed_definitions/NXevent_data_apm.nxdl.xml # contributed_definitions/NXgraph_edge_set.nxdl.xml # contributed_definitions/NXimage_c_set.nxdl.xml # contributed_definitions/NXimage_r_set.nxdl.xml # contributed_definitions/NXion.nxdl.xml # contributed_definitions/NXms_feature_set.nxdl.xml # contributed_definitions/NXoptical_system_em.nxdl.xml # contributed_definitions/NXpulser_apm.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXsimilarity_grouping.nxdl.xml # contributed_definitions/NXspectrum_set.nxdl.xml
# Conflicts: # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXcg_alpha_complex.nxdl.xml # contributed_definitions/NXcg_cylinder_set.nxdl.xml # contributed_definitions/NXcg_ellipsoid_set.nxdl.xml # contributed_definitions/NXcg_face_list_data_structure.nxdl.xml # contributed_definitions/NXcg_grid.nxdl.xml # contributed_definitions/NXcg_half_edge_data_structure.nxdl.xml # contributed_definitions/NXcg_hexahedron_set.nxdl.xml # contributed_definitions/NXcg_parallelogram_set.nxdl.xml # contributed_definitions/NXcg_point_set.nxdl.xml # contributed_definitions/NXcg_polyhedron_set.nxdl.xml # contributed_definitions/NXcg_polyline_set.nxdl.xml # contributed_definitions/NXcg_sphere_set.nxdl.xml # contributed_definitions/NXcorrector_cs.nxdl.xml # contributed_definitions/NXem.nxdl.xml # contributed_definitions/NXem_base.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_ebsd.nxdl.xml # contributed_definitions/NXem_eds.nxdl.xml # contributed_definitions/NXgraph_edge_set.nxdl.xml # contributed_definitions/NXidentifier.nxdl.xml # contributed_definitions/NXimage_c_set.nxdl.xml # contributed_definitions/NXimage_r_set.nxdl.xml # contributed_definitions/NXion.nxdl.xml # contributed_definitions/NXms_feature_set.nxdl.xml # contributed_definitions/NXoptical_system_em.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXscanbox_em.nxdl.xml # contributed_definitions/NXserialized.nxdl.xml # contributed_definitions/NXspectrum_set.nxdl.xml # contributed_definitions/NXxrd.nxdl.xml # contributed_definitions/NXxrd_pan.nxdl.xml # contributed_definitions/nyaml/NXem.yaml # contributed_definitions/nyaml/NXem_base.yaml
# Conflicts: # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXapm_charge_state_analysis.nxdl.xml # contributed_definitions/NXapm_hit_finding.nxdl.xml # contributed_definitions/NXapm_paraprobe_clusterer_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_clusterer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_distancer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_intersector_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_intersector_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_nanochem_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_nanochem_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_ranger_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_selector_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_spatstat_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_spatstat_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_surfacer_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_surfacer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tessellator_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tool_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_transcoder_results.nxdl.xml # contributed_definitions/NXapm_ranging.nxdl.xml # contributed_definitions/NXapm_reconstruction.nxdl.xml # contributed_definitions/NXapm_volt_and_bowl.nxdl.xml # contributed_definitions/NXcg_alpha_complex.nxdl.xml # contributed_definitions/NXcg_cylinder_set.nxdl.xml # contributed_definitions/NXcg_face_list_data_structure.nxdl.xml # contributed_definitions/NXcg_grid.nxdl.xml # contributed_definitions/NXcg_half_edge_data_structure.nxdl.xml # contributed_definitions/NXcg_hexahedron_set.nxdl.xml # contributed_definitions/NXcg_parallelogram_set.nxdl.xml # contributed_definitions/NXcg_point_set.nxdl.xml # contributed_definitions/NXcg_polyline_set.nxdl.xml # contributed_definitions/NXcg_sphere_set.nxdl.xml # contributed_definitions/NXcorrector_cs.nxdl.xml # contributed_definitions/NXdelocalization.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_ebsd.nxdl.xml # contributed_definitions/NXem_eds.nxdl.xml # contributed_definitions/NXevent_data_apm.nxdl.xml # contributed_definitions/NXgraph_edge_set.nxdl.xml # contributed_definitions/NXimage_c_set.nxdl.xml # contributed_definitions/NXimage_r_set.nxdl.xml # contributed_definitions/NXion.nxdl.xml # contributed_definitions/NXms_feature_set.nxdl.xml # contributed_definitions/NXoptical_system_em.nxdl.xml # contributed_definitions/NXpulser_apm.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXscanbox_em.nxdl.xml # contributed_definitions/NXsimilarity_grouping.nxdl.xml # contributed_definitions/NXspectrum_set.nxdl.xml
* Pin nyaml==0.0.8 * Regenerate nxdls # Conflicts: # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXapm_charge_state_analysis.nxdl.xml # contributed_definitions/NXapm_hit_finding.nxdl.xml # contributed_definitions/NXapm_paraprobe_clusterer_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_clusterer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_distancer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_intersector_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_intersector_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_nanochem_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_nanochem_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_ranger_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_selector_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_spatstat_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_spatstat_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_surfacer_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_surfacer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tessellator_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tool_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_transcoder_results.nxdl.xml # contributed_definitions/NXapm_ranging.nxdl.xml # contributed_definitions/NXapm_reconstruction.nxdl.xml # contributed_definitions/NXapm_volt_and_bowl.nxdl.xml # contributed_definitions/NXcg_alpha_complex.nxdl.xml # contributed_definitions/NXcg_cylinder_set.nxdl.xml # contributed_definitions/NXcg_face_list_data_structure.nxdl.xml # contributed_definitions/NXcg_grid.nxdl.xml # contributed_definitions/NXcg_half_edge_data_structure.nxdl.xml # contributed_definitions/NXcg_hexahedron_set.nxdl.xml # contributed_definitions/NXcg_parallelogram_set.nxdl.xml # contributed_definitions/NXcg_point_set.nxdl.xml # contributed_definitions/NXcg_polyline_set.nxdl.xml # contributed_definitions/NXcg_sphere_set.nxdl.xml # contributed_definitions/NXcorrector_cs.nxdl.xml # contributed_definitions/NXdelocalization.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_ebsd.nxdl.xml # contributed_definitions/NXem_eds.nxdl.xml # contributed_definitions/NXevent_data_apm.nxdl.xml # contributed_definitions/NXgraph_edge_set.nxdl.xml # contributed_definitions/NXimage_c_set.nxdl.xml # contributed_definitions/NXimage_r_set.nxdl.xml # contributed_definitions/NXion.nxdl.xml # contributed_definitions/NXms_feature_set.nxdl.xml # contributed_definitions/NXoptical_system_em.nxdl.xml # contributed_definitions/NXpulser_apm.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXscanbox_em.nxdl.xml # contributed_definitions/NXsimilarity_grouping.nxdl.xml # contributed_definitions/NXspectrum_set.nxdl.xml # contributed_definitions/NXstage_lab.nxdl.xml # contributed_definitions/NXsubsampling_filter.nxdl.xml
# Conflicts: # 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_charge_state_analysis.nxdl.xml # base_classes/NXapm_hit_finding.nxdl.xml # base_classes/NXapm_msr.nxdl.xml # base_classes/NXapm_ranging.nxdl.xml # base_classes/NXapm_reconstruction.nxdl.xml # base_classes/NXapm_sim.nxdl.xml # base_classes/NXapm_volt_and_bowl.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/NXcomponent.nxdl.xml # base_classes/NXdata_mpes.nxdl.xml # base_classes/NXdata_mpes_detector.nxdl.xml # base_classes/NXelectron_level.nxdl.xml # base_classes/NXem_eds.nxdl.xml # base_classes/NXevent_data_apm.nxdl.xml # base_classes/NXevent_data_apm_set.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/NXopt_window.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/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
* Refactored cg_primitive base classes for two key aspects: i) make all primitives inherit from new base class NXcg_primitive_set which makes a substantial number of repeated properties of specialized primitive base classes unnecessary, ii) introducing a rigorous mathematical set theoretical approach to describe the number type N, N0, Z, R, R+, R, iii) introduce short hand notation to reduce writing costs for shape/dimensions of arrays: now numpy syntax is used, for scalars (), (1, can be omitted, experience in FAIRmat has shown that in almost all cases the optional doc string to a dimension was almost never used and thus yaml based descriptions can be written more succinct, iv) proof-read docstrings and shortened them, introduced the suggestion to use info: as a keyword which should for now be just appended to the docstring as usual but in the future should be treated as a comment, i.e. only meant for human contextualization but ignored for semantic interpretation of concepts, a key difference that I hope this will bring is to reduce also the length of base classes and appdef as they show up in html pages, specifically for appdefs like NXem many of the conceptual ideas which these docstrings currently contain would be much better placed in a proper documentation instead of the actual class definition in the hope that the overall appearance of classes becomes easier and faster for people to power read; maybe this also works against some criticism that NeXus is considered complex, I have to say with the outsourcing of NXcg_primitive_set I feel it is damn simple now * Refactoring of NXcs base classes * First lot of refactoring EM base classes, the rest tomorrow, NXapm will not be refactored before the APT&M2023 conference in Sept2023, also because feedback from Leoben was positive enough that no immediate changes wrt to appdefs and base classes were required * Summarize the current state of the discussion about coordinate systems with the proposed NXcoordinate_system and NXcoordinate_system_set base classes and best practice recommendations how they should be used including feedback from discussions with Florian Dobner and Tamás Haraszti * Summary of the discussion how to handle conventions and method-specific conventions for EM and methods used in EM * Base classes for implemented examples for pole figures, orientation distribution function, event_data, stage_lab, and ebsd_crystal_structure_model * NXms_ipf base class and dos2unix to correct newlines * Introducing NXem_method base class as a template how to write method-specific deep base classes to describe the terms and taxononmy of method-specific branches to be hooked into appdefs like NXem * Base class inheritance proposal for a now even stronger modularized schema set for electron microscopy research, two tasks remain: i) refactor what is now a method-specific instance rather than an appdef (NXem_ebsd) (mainly to be able to fuse all examples of em-specific data converters including new ebsd examples into one em parser for pynxtools), ii) refactor NXem which is now clearly a specific appdef specializing the NXem_base deep base class, specialization work needs to define which fields and groups from all the possible ones now composable via base classes (inheritance) are required in an appdef NXem for NOMAD OASIS * NXem_ebsd refactored into a base class to use it as a method-specific group inside the NXem application definition, next step: i) refactor NXem_sim, ii) finalize refactoring of NXem appdef (for Nomad oasis) * finished draft of NXem_ebsd, NXem_correlation, and NXem appdef, cleaning the branch * Add proposal for storing mtx cfg, fixed nxtime datatypes * 2d microstructure projection * Inspection how proposed, info, N0, N, R, Z value type abbreviations, and dimensions could be added to nyamlforward * A likely too simplistic but at least working nyaml2nxdl forward mapping to explore further usage of refactored EM base classes. Info keyword has to be a child of doc or the respective text be removed from the standard and put into proposal-specific documentation, how to store what and where so that the schema docstring remain succinct and slim but all these conceptual ideas get not forgotten, typically the would be part of a tech report, i.e. in my opinion all what is under info: sections of a docstring should move to some documentation to tell the story to humans, next test these NXDLs with the NeXus documentation system * Minor fix to handle info keyword spotted while compiling the documentation * Fixes to compile with NeXus documentation test suite and sphinx * Deactivated the annoying clean yaml via make clean for dev purposes * Minor fix in em_base, this completes the appdef/base class work for now on the refactored EM, there are still some spurious info fields now, which should be removed when a decision has been made wrt to how to deal with info: keyword fields in general, next steps: i) make decision on info, ii) test refactored EM proposal with pynxtools em-parser v2, iii) implement backwards * Styling via black * Added yaml2nxdl-forward-converted NXDL files to all refactored base classes and the refactored NXem * Added NXroot header for the em appdef and its base template appdef * Continuing the refactoring of EM and APM plus related base classes for CG and MS based on suggestions from user meetings, discussions with Sandor, represents work with the MPES sprint #83 * Continuing on #83 * Continuing #83, NXcs_* * Continuing #83, ipf, pf, odf * Continuing on #83, support classes for EM * Continued on #83, coordinate system, further base classes supporting EM * Continuing #83, event_data_set and event_data description substantially condensed amongst other points * Added cross-references to base classes for rst, continuing #83 * Aligned old NXem_ebsd_conventions with NXcoordinate_system for #83 * Reviewed method-specific base classes, ebsd, eds, eels, #83 * #83, NXms_recon * #83, composed constraints on the NXem appdef * Consolidated with changes that happened in between on the fairmat branch based on 1016aa0, NXms_recon has still an issue and is therefore deactivated currently, method-specific landing pages need to be updated * Consolidated further with fairmat 15624c0 * Fixing some missing references * Fixed syntax error to compile NXms_recon, docs building also now, reviewing intro pages remains * Consistencies of dimensionality to use NX_POSINT and an enumeration * Recompiled NXDL files using new nyaml module 3d500ced7e4ca57683957c1d61a8d0cb62eccf53, removed, modified by taking the one from fairmat, and synced all files which were binarily different between this feature branch and the fairmat branch specifically commit a15798b of the fairmat branch * Deactivated em-based tests which because of a refactoring of em are not expected to work anymore * Fix improper Latex notation in math environment for polyline, face_list, nanochem * Added recompiled NXidentifier, NXserialized NXDLs which triggered pipeline errors in CatChen gh action * Some round of proof-reading * Fixed test_nxdl_utils to reflect and use refactored locations of refactored NXem * Added feedback from @phyy-nx, @PeterC-DLS, and @prjemian from discussed here https://github.com/nexusformat/definitions PR nexusformat#1271 * Black formatting * Reactivated data type check for e.g. NXem NX_NUMBER * Implementing NX_DATE_TIME suggestion of @sanbrock --------- Co-authored-by: markus.kuehbach <[email protected]> # Conflicts: # applications/NXapm.nxdl.xml # applications/NXem.nxdl.xml # base_classes/NXaberration.nxdl.xml # base_classes/NXcg_alpha_complex.nxdl.xml # base_classes/NXcg_cylinder_set.nxdl.xml # base_classes/NXcg_ellipsoid_set.nxdl.xml # base_classes/NXcg_face_list_data_structure.nxdl.xml # base_classes/NXcg_geodesic_mesh.nxdl.xml # base_classes/NXcg_grid.nxdl.xml # base_classes/NXcg_half_edge_data_structure.nxdl.xml # base_classes/NXcg_hexahedron_set.nxdl.xml # base_classes/NXcg_marching_cubes.nxdl.xml # base_classes/NXcg_parallelogram_set.nxdl.xml # base_classes/NXcg_point_set.nxdl.xml # base_classes/NXcg_polygon_set.nxdl.xml # base_classes/NXcg_polyhedron_set.nxdl.xml # base_classes/NXcg_polyline_set.nxdl.xml # base_classes/NXcg_roi_set.nxdl.xml # base_classes/NXcg_sphere_set.nxdl.xml # base_classes/NXcg_tetrahedron_set.nxdl.xml # base_classes/NXcg_triangle_set.nxdl.xml # base_classes/NXcg_triangulated_surface_mesh.nxdl.xml # base_classes/NXcg_unit_normal_set.nxdl.xml # base_classes/NXchamber.nxdl.xml # base_classes/NXcoordinate_system_set.nxdl.xml # base_classes/NXcorrector_cs.nxdl.xml # base_classes/NXcs_computer.nxdl.xml # base_classes/NXcs_filter_boolean_mask.nxdl.xml # base_classes/NXcs_prng.nxdl.xml # base_classes/NXcs_profiling.nxdl.xml # base_classes/NXcs_profiling_event.nxdl.xml # base_classes/NXdeflector.nxdl.xml # base_classes/NXebeam_column.nxdl.xml # base_classes/NXem_ebsd.nxdl.xml # base_classes/NXevent_data_em.nxdl.xml # base_classes/NXevent_data_em_set.nxdl.xml # base_classes/NXfabrication.nxdl.xml # base_classes/NXibeam_column.nxdl.xml # base_classes/NXimage_set.nxdl.xml # base_classes/NXion.nxdl.xml # base_classes/NXlens_em.nxdl.xml # base_classes/NXoptical_system_em.nxdl.xml # base_classes/NXpump.nxdl.xml # base_classes/NXscanbox_em.nxdl.xml # base_classes/NXspectrum_set.nxdl.xml # base_classes/NXstage_lab.nxdl.xml # contributed_definitions/NXaberration_model.nxdl.xml # contributed_definitions/NXaberration_model_ceos.nxdl.xml # contributed_definitions/NXaberration_model_nion.nxdl.xml # contributed_definitions/NXaperture_em.nxdl.xml # contributed_definitions/NXapm_paraprobe_results_nanochem.nxdl.xml # contributed_definitions/NXcomponent_em.nxdl.xml # contributed_definitions/NXcs_gpu_obj.nxdl.xml # contributed_definitions/NXcs_gpu_sys.nxdl.xml # contributed_definitions/NXcs_io_obj.nxdl.xml # contributed_definitions/NXcs_io_sys.nxdl.xml # contributed_definitions/NXcs_mm_sys.nxdl.xml # contributed_definitions/NXem_adf.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_conventions_ebsd.nxdl.xml # contributed_definitions/NXem_ebsd_crystal_structure_model.nxdl.xml # contributed_definitions/NXgraph_edge_set.nxdl.xml # contributed_definitions/NXgraph_node_set.nxdl.xml # contributed_definitions/NXgraph_root.nxdl.xml # contributed_definitions/NXimage_r_set_diff.nxdl.xml # contributed_definitions/NXimage_set_em_adf.nxdl.xml # contributed_definitions/NXimage_set_em_kikuchi.nxdl.xml # contributed_definitions/NXinteraction_vol_em.nxdl.xml # contributed_definitions/NXisocontour.nxdl.xml # contributed_definitions/NXms.nxdl.xml # contributed_definitions/NXms_feature_set.nxdl.xml # contributed_definitions/NXms_ipf.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/NXms_score_results.nxdl.xml # contributed_definitions/NXorientation_set.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXspectrum_set_em_eels.nxdl.xml # contributed_definitions/NXspectrum_set_em_xray.nxdl.xml # contributed_definitions/nyaml/NXaberration.yaml # contributed_definitions/nyaml/NXaberration_model.yaml # contributed_definitions/nyaml/NXaberration_model_ceos.yaml # contributed_definitions/nyaml/NXaberration_model_nion.yaml # contributed_definitions/nyaml/NXaperture_em.yaml # contributed_definitions/nyaml/NXapm.yaml # contributed_definitions/nyaml/NXapm_paraprobe_results_nanochem.yaml # contributed_definitions/nyaml/NXcg_alpha_complex.yaml # contributed_definitions/nyaml/NXcg_cylinder_set.yaml # contributed_definitions/nyaml/NXcg_ellipsoid_set.yaml # contributed_definitions/nyaml/NXcg_face_list_data_structure.yaml # contributed_definitions/nyaml/NXcg_geodesic_mesh.yaml # contributed_definitions/nyaml/NXcg_grid.yaml # contributed_definitions/nyaml/NXcg_half_edge_data_structure.yaml # contributed_definitions/nyaml/NXcg_hexahedron_set.yaml # contributed_definitions/nyaml/NXcg_marching_cubes.yaml # contributed_definitions/nyaml/NXcg_parallelogram_set.yaml # contributed_definitions/nyaml/NXcg_point_set.yaml # contributed_definitions/nyaml/NXcg_polygon_set.yaml # contributed_definitions/nyaml/NXcg_polyhedron_set.yaml # contributed_definitions/nyaml/NXcg_polyline_set.yaml # contributed_definitions/nyaml/NXcg_roi_set.yaml # contributed_definitions/nyaml/NXcg_sphere_set.yaml # contributed_definitions/nyaml/NXcg_tetrahedron_set.yaml # contributed_definitions/nyaml/NXcg_triangle_set.yaml # contributed_definitions/nyaml/NXcg_triangulated_surface_mesh.yaml # contributed_definitions/nyaml/NXcg_unit_normal_set.yaml # contributed_definitions/nyaml/NXchamber.yaml # contributed_definitions/nyaml/NXcoordinate_system_set.yaml # contributed_definitions/nyaml/NXcorrector_cs.yaml # contributed_definitions/nyaml/NXcs_computer.yaml # contributed_definitions/nyaml/NXcs_filter_boolean_mask.yaml # contributed_definitions/nyaml/NXcs_io_obj.yaml # contributed_definitions/nyaml/NXcs_io_sys.yaml # contributed_definitions/nyaml/NXcs_mm_sys.yaml # contributed_definitions/nyaml/NXcs_prng.yaml # contributed_definitions/nyaml/NXcs_profiling.yaml # contributed_definitions/nyaml/NXcs_profiling_event.yaml # contributed_definitions/nyaml/NXdeflector.yaml # contributed_definitions/nyaml/NXebeam_column.yaml # contributed_definitions/nyaml/NXem.yaml # contributed_definitions/nyaml/NXem_ebsd.yaml # contributed_definitions/nyaml/NXevent_data_em.yaml # contributed_definitions/nyaml/NXevent_data_em_set.yaml # contributed_definitions/nyaml/NXfabrication.yaml # contributed_definitions/nyaml/NXgraph_edge_set.yaml # contributed_definitions/nyaml/NXgraph_node_set.yaml # contributed_definitions/nyaml/NXgraph_root.yaml # contributed_definitions/nyaml/NXibeam_column.yaml # contributed_definitions/nyaml/NXimage_set.yaml # contributed_definitions/nyaml/NXinteraction_vol_em.yaml # contributed_definitions/nyaml/NXion.yaml # contributed_definitions/nyaml/NXisocontour.yaml # contributed_definitions/nyaml/NXlens_em.yaml # contributed_definitions/nyaml/NXms.yaml # contributed_definitions/nyaml/NXms_feature_set.yaml # contributed_definitions/nyaml/NXms_score_results.yaml # contributed_definitions/nyaml/NXoptical_system_em.yaml # contributed_definitions/nyaml/NXpump.yaml # contributed_definitions/nyaml/NXrotation_set.yaml # contributed_definitions/nyaml/NXscanbox_em.yaml # contributed_definitions/nyaml/NXspectrum_set.yaml # contributed_definitions/nyaml/NXstage_lab.yaml # dev_tools/tests/test_nxdl_utils.py # manual/source/classes/contributed_definitions/cgms-structure.rst # manual/source/classes/contributed_definitions/em-structure.rst # manual/source/classes/contributed_definitions/icme-structure.rst
# Conflicts: # base_classes/NXcollectioncolumn.nxdl.xml # base_classes/NXem_img.nxdl.xml # base_classes/NXem_method.nxdl.xml # base_classes/NXroi.nxdl.xml # base_classes/NXroot.nxdl.xml # contributed_definitions/NXaberration.nxdl.xml # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXcalibration.nxdl.xml # contributed_definitions/NXchamber.nxdl.xml # contributed_definitions/NXcomponent_em.nxdl.xml # contributed_definitions/NXcoordinate_system_set.nxdl.xml # contributed_definitions/NXcorrector_cs.nxdl.xml # contributed_definitions/NXcs_computer.nxdl.xml # contributed_definitions/NXcs_filter_boolean_mask.nxdl.xml # contributed_definitions/NXcs_prng.nxdl.xml # contributed_definitions/NXcs_profiling.nxdl.xml # contributed_definitions/NXcs_profiling_event.nxdl.xml # contributed_definitions/NXebeam_column.nxdl.xml # contributed_definitions/NXelectronanalyser.nxdl.xml # contributed_definitions/NXem.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_conventions_ebsd.nxdl.xml # contributed_definitions/NXem_ebsd.nxdl.xml # contributed_definitions/NXenergydispersion.nxdl.xml # contributed_definitions/NXevent_data_em.nxdl.xml # contributed_definitions/NXevent_data_em_set.nxdl.xml # contributed_definitions/NXibeam_column.nxdl.xml # contributed_definitions/NXidentifier.nxdl.xml # contributed_definitions/NXimage_r_set_diff.nxdl.xml # contributed_definitions/NXimage_set.nxdl.xml # contributed_definitions/NXinteraction_vol_em.nxdl.xml # contributed_definitions/NXion.nxdl.xml # contributed_definitions/NXlens_em.nxdl.xml # contributed_definitions/NXmpes.nxdl.xml # contributed_definitions/NXms_ipf.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_recon.nxdl.xml # contributed_definitions/NXoptical_system_em.nxdl.xml # contributed_definitions/NXpump.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXscanbox_em.nxdl.xml # contributed_definitions/NXserialized.nxdl.xml # contributed_definitions/NXspectrum_set.nxdl.xml # contributed_definitions/NXstage_lab.nxdl.xml # contributed_definitions/NXxrd.nxdl.xml # contributed_definitions/NXxrd_pan.nxdl.xml
# Conflicts: # base_classes/NXroot.nxdl.xml # contributed_definitions/NXcomponent_em.nxdl.xml # contributed_definitions/NXcs_gpu_sys.nxdl.xml # contributed_definitions/NXem_adf.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_conventions_ebsd.nxdl.xml # contributed_definitions/NXidentifier.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_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/NXrotation_set.nxdl.xml # contributed_definitions/NXserialized.nxdl.xml # contributed_definitions/NXxrd.nxdl.xml # contributed_definitions/NXxrd_pan.nxdl.xml
…s 0572bfa9df6f513325024185ed1f1c1901d0758c # Conflicts: # base_classes/NXpeak.nxdl.xml # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXapm_charge_state_analysis.nxdl.xml # contributed_definitions/NXapm_hit_finding.nxdl.xml # contributed_definitions/NXapm_msr.nxdl.xml # contributed_definitions/NXapm_paraprobe_ranger_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_ranger_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tool_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_tool_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_transcoder_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_transcoder_results.nxdl.xml # contributed_definitions/NXapm_ranging.nxdl.xml # contributed_definitions/NXapm_reconstruction.nxdl.xml # contributed_definitions/NXapm_sim.nxdl.xml # contributed_definitions/NXapm_volt_and_bowl.nxdl.xml # contributed_definitions/NXcomponent_em.nxdl.xml # contributed_definitions/NXcs_gpu_sys.nxdl.xml # contributed_definitions/NXem_adf.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_conventions_ebsd.nxdl.xml # contributed_definitions/NXevent_data_apm.nxdl.xml # contributed_definitions/NXevent_data_apm_set.nxdl.xml # contributed_definitions/NXidentifier.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_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/NXpulser_apm.nxdl.xml # contributed_definitions/NXreflectron.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXserialized.nxdl.xml # contributed_definitions/NXxrd.nxdl.xml # contributed_definitions/NXxrd_pan.nxdl.xml # contributed_definitions/nyaml/NXapm.yaml # contributed_definitions/nyaml/NXapm_charge_state_analysis.yaml # contributed_definitions/nyaml/NXapm_hit_finding.yaml # contributed_definitions/nyaml/NXapm_ranging.yaml # contributed_definitions/nyaml/NXapm_reconstruction.yaml # contributed_definitions/nyaml/NXapm_volt_and_bowl.yaml # contributed_definitions/nyaml/NXevent_data_apm.yaml # contributed_definitions/nyaml/NXpeak.yaml
# Conflicts: # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXcomponent_em.nxdl.xml # contributed_definitions/NXcorrector_cs.nxdl.xml # contributed_definitions/NXcs_gpu_sys.nxdl.xml # contributed_definitions/NXem.nxdl.xml # contributed_definitions/NXem_adf.nxdl.xml # contributed_definitions/NXem_base.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_conventions_ebsd.nxdl.xml # contributed_definitions/NXem_ebsd.nxdl.xml # contributed_definitions/NXem_eds.nxdl.xml # contributed_definitions/NXgraph_edge_set.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/NXion.nxdl.xml # contributed_definitions/NXms_feature_set.nxdl.xml # contributed_definitions/NXms_ipf.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/NXoptical_system_em.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXscanbox_em.nxdl.xml # contributed_definitions/NXserialized.nxdl.xml # contributed_definitions/NXspectrum_set.nxdl.xml # contributed_definitions/NXxrd.nxdl.xml # contributed_definitions/NXxrd_pan.nxdl.xml # contributed_definitions/nyaml/NXem.yaml # contributed_definitions/nyaml/NXem_base.yaml
# 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_charge_state_analysis.nxdl.xml # base_classes/NXapm_hit_finding.nxdl.xml # base_classes/NXapm_msr.nxdl.xml # base_classes/NXapm_ranging.nxdl.xml # base_classes/NXapm_reconstruction.nxdl.xml # base_classes/NXapm_sim.nxdl.xml # base_classes/NXapm_volt_and_bowl.nxdl.xml # base_classes/NXbeam_device.nxdl.xml # base_classes/NXbeam_transfer_matrix_table.nxdl.xml # base_classes/NXcg_primitive_set.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/NXdeflector.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/NXevent_data_apm.nxdl.xml # base_classes/NXevent_data_apm_set.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/NXreflectron.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/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/NXdeflector.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
* Refactored cg_primitive base classes for two key aspects: i) make all primitives inherit from new base class NXcg_primitive_set which makes a substantial number of repeated properties of specialized primitive base classes unnecessary, ii) introducing a rigorous mathematical set theoretical approach to describe the number type N, N0, Z, R, R+, R, iii) introduce short hand notation to reduce writing costs for shape/dimensions of arrays: now numpy syntax is used, for scalars (), (1, can be omitted, experience in FAIRmat has shown that in almost all cases the optional doc string to a dimension was almost never used and thus yaml based descriptions can be written more succinct, iv) proof-read docstrings and shortened them, introduced the suggestion to use info: as a keyword which should for now be just appended to the docstring as usual but in the future should be treated as a comment, i.e. only meant for human contextualization but ignored for semantic interpretation of concepts, a key difference that I hope this will bring is to reduce also the length of base classes and appdef as they show up in html pages, specifically for appdefs like NXem many of the conceptual ideas which these docstrings currently contain would be much better placed in a proper documentation instead of the actual class definition in the hope that the overall appearance of classes becomes easier and faster for people to power read; maybe this also works against some criticism that NeXus is considered complex, I have to say with the outsourcing of NXcg_primitive_set I feel it is damn simple now * Refactoring of NXcs base classes * First lot of refactoring EM base classes, the rest tomorrow, NXapm will not be refactored before the APT&M2023 conference in Sept2023, also because feedback from Leoben was positive enough that no immediate changes wrt to appdefs and base classes were required * Summarize the current state of the discussion about coordinate systems with the proposed NXcoordinate_system and NXcoordinate_system_set base classes and best practice recommendations how they should be used including feedback from discussions with Florian Dobner and Tamás Haraszti * Summary of the discussion how to handle conventions and method-specific conventions for EM and methods used in EM * Base classes for implemented examples for pole figures, orientation distribution function, event_data, stage_lab, and ebsd_crystal_structure_model * NXms_ipf base class and dos2unix to correct newlines * Introducing NXem_method base class as a template how to write method-specific deep base classes to describe the terms and taxononmy of method-specific branches to be hooked into appdefs like NXem * Base class inheritance proposal for a now even stronger modularized schema set for electron microscopy research, two tasks remain: i) refactor what is now a method-specific instance rather than an appdef (NXem_ebsd) (mainly to be able to fuse all examples of em-specific data converters including new ebsd examples into one em parser for pynxtools), ii) refactor NXem which is now clearly a specific appdef specializing the NXem_base deep base class, specialization work needs to define which fields and groups from all the possible ones now composable via base classes (inheritance) are required in an appdef NXem for NOMAD OASIS * NXem_ebsd refactored into a base class to use it as a method-specific group inside the NXem application definition, next step: i) refactor NXem_sim, ii) finalize refactoring of NXem appdef (for Nomad oasis) * finished draft of NXem_ebsd, NXem_correlation, and NXem appdef, cleaning the branch * Add proposal for storing mtx cfg, fixed nxtime datatypes * 2d microstructure projection * Inspection how proposed, info, N0, N, R, Z value type abbreviations, and dimensions could be added to nyamlforward * A likely too simplistic but at least working nyaml2nxdl forward mapping to explore further usage of refactored EM base classes. Info keyword has to be a child of doc or the respective text be removed from the standard and put into proposal-specific documentation, how to store what and where so that the schema docstring remain succinct and slim but all these conceptual ideas get not forgotten, typically the would be part of a tech report, i.e. in my opinion all what is under info: sections of a docstring should move to some documentation to tell the story to humans, next test these NXDLs with the NeXus documentation system * Minor fix to handle info keyword spotted while compiling the documentation * Fixes to compile with NeXus documentation test suite and sphinx * Deactivated the annoying clean yaml via make clean for dev purposes * Minor fix in em_base, this completes the appdef/base class work for now on the refactored EM, there are still some spurious info fields now, which should be removed when a decision has been made wrt to how to deal with info: keyword fields in general, next steps: i) make decision on info, ii) test refactored EM proposal with pynxtools em-parser v2, iii) implement backwards * Styling via black * Added yaml2nxdl-forward-converted NXDL files to all refactored base classes and the refactored NXem * Added NXroot header for the em appdef and its base template appdef * Continuing the refactoring of EM and APM plus related base classes for CG and MS based on suggestions from user meetings, discussions with Sandor, represents work with the MPES sprint #83 * Continuing on #83 * Continuing #83, NXcs_* * Continuing #83, ipf, pf, odf * Continuing on #83, support classes for EM * Continued on #83, coordinate system, further base classes supporting EM * Continuing #83, event_data_set and event_data description substantially condensed amongst other points * Added cross-references to base classes for rst, continuing #83 * Aligned old NXem_ebsd_conventions with NXcoordinate_system for #83 * Reviewed method-specific base classes, ebsd, eds, eels, #83 * #83, NXms_recon * #83, composed constraints on the NXem appdef * Consolidated with changes that happened in between on the fairmat branch based on 1016aa0, NXms_recon has still an issue and is therefore deactivated currently, method-specific landing pages need to be updated * Consolidated further with fairmat 15624c0 * Fixing some missing references * Fixed syntax error to compile NXms_recon, docs building also now, reviewing intro pages remains * Consistencies of dimensionality to use NX_POSINT and an enumeration * Recompiled NXDL files using new nyaml module 3d500ced7e4ca57683957c1d61a8d0cb62eccf53, removed, modified by taking the one from fairmat, and synced all files which were binarily different between this feature branch and the fairmat branch specifically commit a15798b of the fairmat branch * Deactivated em-based tests which because of a refactoring of em are not expected to work anymore * Fix improper Latex notation in math environment for polyline, face_list, nanochem * Added recompiled NXidentifier, NXserialized NXDLs which triggered pipeline errors in CatChen gh action * Some round of proof-reading * Fixed test_nxdl_utils to reflect and use refactored locations of refactored NXem * Added feedback from @phyy-nx, @PeterC-DLS, and @prjemian from discussed here https://github.com/nexusformat/definitions PR nexusformat#1271 * Black formatting * Reactivated data type check for e.g. NXem NX_NUMBER * Implementing NX_DATE_TIME suggestion of @sanbrock --------- Co-authored-by: markus.kuehbach <[email protected]> # Conflicts: # applications/NXapm.nxdl.xml # applications/NXem.nxdl.xml # base_classes/NXaberration.nxdl.xml # base_classes/NXcg_alpha_complex.nxdl.xml # base_classes/NXcg_geodesic_mesh.nxdl.xml # base_classes/NXcg_grid.nxdl.xml # base_classes/NXcg_half_edge_data_structure.nxdl.xml # base_classes/NXcg_marching_cubes.nxdl.xml # base_classes/NXcg_polyline_set.nxdl.xml # base_classes/NXcg_triangulated_surface_mesh.nxdl.xml # base_classes/NXcg_unit_normal_set.nxdl.xml # base_classes/NXchamber.nxdl.xml # base_classes/NXcoordinate_system_set.nxdl.xml # base_classes/NXcorrector_cs.nxdl.xml # base_classes/NXcs_computer.nxdl.xml # base_classes/NXcs_filter_boolean_mask.nxdl.xml # base_classes/NXcs_prng.nxdl.xml # base_classes/NXcs_profiling.nxdl.xml # base_classes/NXcs_profiling_event.nxdl.xml # base_classes/NXebeam_column.nxdl.xml # base_classes/NXem_ebsd.nxdl.xml # base_classes/NXevent_data_em.nxdl.xml # base_classes/NXevent_data_em_set.nxdl.xml # base_classes/NXibeam_column.nxdl.xml # base_classes/NXimage_set.nxdl.xml # base_classes/NXion.nxdl.xml # base_classes/NXlens_em.nxdl.xml # base_classes/NXoptical_system_em.nxdl.xml # base_classes/NXpump.nxdl.xml # base_classes/NXregistration.nxdl.xml # base_classes/NXroi.nxdl.xml # base_classes/NXscanbox_em.nxdl.xml # base_classes/NXspectrum_set.nxdl.xml # base_classes/NXstage_lab.nxdl.xml # contributed_definitions/NXaberration_model.nxdl.xml # contributed_definitions/NXaberration_model_ceos.nxdl.xml # contributed_definitions/NXaberration_model_nion.nxdl.xml # contributed_definitions/NXaperture_em.nxdl.xml # contributed_definitions/NXapm_paraprobe_results_nanochem.nxdl.xml # contributed_definitions/NXcg_cylinder_set.nxdl.xml # contributed_definitions/NXcg_ellipsoid_set.nxdl.xml # contributed_definitions/NXcg_face_list_data_structure.nxdl.xml # contributed_definitions/NXcg_hexahedron_set.nxdl.xml # contributed_definitions/NXcg_parallelogram_set.nxdl.xml # contributed_definitions/NXcg_point_set.nxdl.xml # contributed_definitions/NXcg_polygon_set.nxdl.xml # contributed_definitions/NXcg_polyhedron_set.nxdl.xml # contributed_definitions/NXcg_sphere_set.nxdl.xml # contributed_definitions/NXcg_tetrahedron_set.nxdl.xml # contributed_definitions/NXcg_triangle_set.nxdl.xml # contributed_definitions/NXcs_io_obj.nxdl.xml # contributed_definitions/NXcs_io_sys.nxdl.xml # contributed_definitions/NXcs_mm_sys.nxdl.xml # contributed_definitions/NXdeflector.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_ebsd_crystal_structure_model.nxdl.xml # contributed_definitions/NXgraph_edge_set.nxdl.xml # contributed_definitions/NXgraph_node_set.nxdl.xml # contributed_definitions/NXgraph_root.nxdl.xml # contributed_definitions/NXimage_set_em_adf.nxdl.xml # contributed_definitions/NXimage_set_em_kikuchi.nxdl.xml # contributed_definitions/NXinteraction_vol_em.nxdl.xml # contributed_definitions/NXisocontour.nxdl.xml # contributed_definitions/NXms.nxdl.xml # contributed_definitions/NXms_feature_set.nxdl.xml # contributed_definitions/NXms_score_results.nxdl.xml # contributed_definitions/NXorientation_set.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXspectrum_set_em_eels.nxdl.xml # contributed_definitions/NXspectrum_set_em_xray.nxdl.xml # contributed_definitions/nyaml/NXaberration.yaml # contributed_definitions/nyaml/NXaberration_model.yaml # contributed_definitions/nyaml/NXaberration_model_ceos.yaml # contributed_definitions/nyaml/NXaberration_model_nion.yaml # contributed_definitions/nyaml/NXaperture_em.yaml # contributed_definitions/nyaml/NXapm.yaml # contributed_definitions/nyaml/NXapm_paraprobe_results_nanochem.yaml # contributed_definitions/nyaml/NXcg_alpha_complex.yaml # contributed_definitions/nyaml/NXcg_cylinder_set.yaml # contributed_definitions/nyaml/NXcg_ellipsoid_set.yaml # contributed_definitions/nyaml/NXcg_face_list_data_structure.yaml # contributed_definitions/nyaml/NXcg_geodesic_mesh.yaml # contributed_definitions/nyaml/NXcg_grid.yaml # contributed_definitions/nyaml/NXcg_half_edge_data_structure.yaml # contributed_definitions/nyaml/NXcg_hexahedron_set.yaml # contributed_definitions/nyaml/NXcg_marching_cubes.yaml # contributed_definitions/nyaml/NXcg_parallelogram_set.yaml # contributed_definitions/nyaml/NXcg_point_set.yaml # contributed_definitions/nyaml/NXcg_polygon_set.yaml # contributed_definitions/nyaml/NXcg_polyhedron_set.yaml # contributed_definitions/nyaml/NXcg_polyline_set.yaml # contributed_definitions/nyaml/NXcg_roi_set.yaml # contributed_definitions/nyaml/NXcg_sphere_set.yaml # contributed_definitions/nyaml/NXcg_tetrahedron_set.yaml # contributed_definitions/nyaml/NXcg_triangle_set.yaml # contributed_definitions/nyaml/NXcg_triangulated_surface_mesh.yaml # contributed_definitions/nyaml/NXcg_unit_normal_set.yaml # contributed_definitions/nyaml/NXchamber.yaml # contributed_definitions/nyaml/NXcoordinate_system_set.yaml # contributed_definitions/nyaml/NXcorrector_cs.yaml # contributed_definitions/nyaml/NXcs_computer.yaml # contributed_definitions/nyaml/NXcs_filter_boolean_mask.yaml # contributed_definitions/nyaml/NXcs_io_obj.yaml # contributed_definitions/nyaml/NXcs_io_sys.yaml # contributed_definitions/nyaml/NXcs_mm_sys.yaml # contributed_definitions/nyaml/NXcs_prng.yaml # contributed_definitions/nyaml/NXcs_profiling.yaml # contributed_definitions/nyaml/NXcs_profiling_event.yaml # contributed_definitions/nyaml/NXdeflector.yaml # contributed_definitions/nyaml/NXebeam_column.yaml # contributed_definitions/nyaml/NXem.yaml # contributed_definitions/nyaml/NXem_ebsd.yaml # contributed_definitions/nyaml/NXevent_data_em.yaml # contributed_definitions/nyaml/NXevent_data_em_set.yaml # contributed_definitions/nyaml/NXfabrication.yaml # contributed_definitions/nyaml/NXgraph_edge_set.yaml # contributed_definitions/nyaml/NXgraph_node_set.yaml # contributed_definitions/nyaml/NXgraph_root.yaml # contributed_definitions/nyaml/NXibeam_column.yaml # contributed_definitions/nyaml/NXimage_set.yaml # contributed_definitions/nyaml/NXinteraction_vol_em.yaml # contributed_definitions/nyaml/NXion.yaml # contributed_definitions/nyaml/NXisocontour.yaml # contributed_definitions/nyaml/NXlens_em.yaml # contributed_definitions/nyaml/NXms.yaml # contributed_definitions/nyaml/NXms_feature_set.yaml # contributed_definitions/nyaml/NXms_score_results.yaml # contributed_definitions/nyaml/NXoptical_system_em.yaml # contributed_definitions/nyaml/NXpump.yaml # contributed_definitions/nyaml/NXrotation_set.yaml # contributed_definitions/nyaml/NXscanbox_em.yaml # contributed_definitions/nyaml/NXspectrum_set.yaml # contributed_definitions/nyaml/NXstage_lab.yaml # dev_tools/tests/test_nxdl_utils.py # manual/source/classes/contributed_definitions/cgms-structure.rst # manual/source/classes/contributed_definitions/em-structure.rst # manual/source/classes/contributed_definitions/icme-structure.rst
# Conflicts: # base_classes/NXcg_roi_set.nxdl.xml # base_classes/NXem_img.nxdl.xml # base_classes/NXem_method.nxdl.xml # base_classes/NXprogram.nxdl.xml # base_classes/NXroot.nxdl.xml # base_classes/NXspindispersion.nxdl.xml # contributed_definitions/NXaberration.nxdl.xml # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXcalibration.nxdl.xml # contributed_definitions/NXcoordinate_system_set.nxdl.xml # contributed_definitions/NXcorrector_cs.nxdl.xml # contributed_definitions/NXcs_computer.nxdl.xml # contributed_definitions/NXcs_filter_boolean_mask.nxdl.xml # contributed_definitions/NXcs_prng.nxdl.xml # contributed_definitions/NXcs_profiling.nxdl.xml # contributed_definitions/NXcs_profiling_event.nxdl.xml # contributed_definitions/NXebeam_column.nxdl.xml # contributed_definitions/NXelectronanalyser.nxdl.xml # contributed_definitions/NXem.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_ebsd.nxdl.xml # contributed_definitions/NXenergydispersion.nxdl.xml # contributed_definitions/NXevent_data_em.nxdl.xml # contributed_definitions/NXevent_data_em_set.nxdl.xml # contributed_definitions/NXfabrication.nxdl.xml # contributed_definitions/NXibeam_column.nxdl.xml # contributed_definitions/NXidentifier.nxdl.xml # contributed_definitions/NXinteraction_vol_em.nxdl.xml # contributed_definitions/NXion.nxdl.xml # contributed_definitions/NXlens_em.nxdl.xml # contributed_definitions/NXmpes.nxdl.xml # contributed_definitions/NXoptical_system_em.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXscanbox_em.nxdl.xml # contributed_definitions/NXserialized.nxdl.xml # contributed_definitions/NXspectrum_set.nxdl.xml # contributed_definitions/NXstage_lab.nxdl.xml # contributed_definitions/NXxrd.nxdl.xml # contributed_definitions/NXxrd_pan.nxdl.xml
# Conflicts: # base_classes/NXroot.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXidentifier.nxdl.xml # contributed_definitions/NXimage_set.nxdl.xml # contributed_definitions/NXinteraction_vol_em.nxdl.xml # contributed_definitions/NXpump.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: # base_classes/NXroot.nxdl.xml # contributed_definitions/NXchamber.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXidentifier.nxdl.xml # contributed_definitions/NXimage_set.nxdl.xml # contributed_definitions/NXinteraction_vol_em.nxdl.xml # contributed_definitions/NXpump.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXserialized.nxdl.xml # contributed_definitions/NXxrd.nxdl.xml # contributed_definitions/NXxrd_pan.nxdl.xml
…s 0572bfa9df6f513325024185ed1f1c1901d0758c # Conflicts: # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXapm_charge_state_analysis.nxdl.xml # contributed_definitions/NXapm_hit_finding.nxdl.xml # contributed_definitions/NXapm_msr.nxdl.xml # contributed_definitions/NXapm_paraprobe_ranger_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_ranger_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tool_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_tool_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_transcoder_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_transcoder_results.nxdl.xml # contributed_definitions/NXapm_ranging.nxdl.xml # contributed_definitions/NXapm_reconstruction.nxdl.xml # contributed_definitions/NXapm_sim.nxdl.xml # contributed_definitions/NXapm_volt_and_bowl.nxdl.xml # contributed_definitions/NXchamber.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXevent_data_apm.nxdl.xml # contributed_definitions/NXevent_data_apm_set.nxdl.xml # contributed_definitions/NXidentifier.nxdl.xml # contributed_definitions/NXimage_set.nxdl.xml # contributed_definitions/NXinteraction_vol_em.nxdl.xml # contributed_definitions/NXpeak.nxdl.xml # contributed_definitions/NXpulser_apm.nxdl.xml # contributed_definitions/NXpump.nxdl.xml # contributed_definitions/NXreflectron.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXserialized.nxdl.xml # contributed_definitions/NXxrd.nxdl.xml # contributed_definitions/NXxrd_pan.nxdl.xml # contributed_definitions/nyaml/NXapm.yaml # contributed_definitions/nyaml/NXapm_charge_state_analysis.yaml # contributed_definitions/nyaml/NXapm_hit_finding.yaml # contributed_definitions/nyaml/NXapm_ranging.yaml # contributed_definitions/nyaml/NXapm_reconstruction.yaml # contributed_definitions/nyaml/NXapm_volt_and_bowl.yaml # contributed_definitions/nyaml/NXevent_data_apm.yaml # contributed_definitions/nyaml/NXpeak.yaml
# Conflicts: # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXapm_charge_state_analysis.nxdl.xml # contributed_definitions/NXapm_hit_finding.nxdl.xml # contributed_definitions/NXapm_paraprobe_clusterer_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_clusterer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_distancer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_intersector_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_intersector_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_nanochem_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_nanochem_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_ranger_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_selector_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_spatstat_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_spatstat_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_surfacer_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_surfacer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tessellator_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tool_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_transcoder_results.nxdl.xml # contributed_definitions/NXapm_ranging.nxdl.xml # contributed_definitions/NXapm_reconstruction.nxdl.xml # contributed_definitions/NXapm_volt_and_bowl.nxdl.xml # contributed_definitions/NXcg_cylinder_set.nxdl.xml # contributed_definitions/NXcg_face_list_data_structure.nxdl.xml # contributed_definitions/NXcg_hexahedron_set.nxdl.xml # contributed_definitions/NXcg_parallelogram_set.nxdl.xml # contributed_definitions/NXcg_point_set.nxdl.xml # contributed_definitions/NXcorrector_cs.nxdl.xml # contributed_definitions/NXdelocalization.nxdl.xml # contributed_definitions/NXem_base.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_ebsd.nxdl.xml # contributed_definitions/NXem_eds.nxdl.xml # contributed_definitions/NXevent_data_apm.nxdl.xml # contributed_definitions/NXgraph_edge_set.nxdl.xml # contributed_definitions/NXimage_c_set.nxdl.xml # contributed_definitions/NXimage_r_set.nxdl.xml # contributed_definitions/NXion.nxdl.xml # contributed_definitions/NXms_feature_set.nxdl.xml # contributed_definitions/NXoptical_system_em.nxdl.xml # contributed_definitions/NXpulser_apm.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXsimilarity_grouping.nxdl.xml # contributed_definitions/NXspectrum_set.nxdl.xml
# Conflicts: # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXcg_cylinder_set.nxdl.xml # contributed_definitions/NXcg_ellipsoid_set.nxdl.xml # contributed_definitions/NXcg_face_list_data_structure.nxdl.xml # contributed_definitions/NXcg_hexahedron_set.nxdl.xml # contributed_definitions/NXcg_parallelogram_set.nxdl.xml # contributed_definitions/NXcg_point_set.nxdl.xml # contributed_definitions/NXcg_polyhedron_set.nxdl.xml # contributed_definitions/NXcg_sphere_set.nxdl.xml # contributed_definitions/NXchamber.nxdl.xml # contributed_definitions/NXcorrector_cs.nxdl.xml # contributed_definitions/NXem.nxdl.xml # contributed_definitions/NXem_base.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_ebsd.nxdl.xml # contributed_definitions/NXem_eds.nxdl.xml # contributed_definitions/NXgraph_edge_set.nxdl.xml # contributed_definitions/NXidentifier.nxdl.xml # contributed_definitions/NXimage_c_set.nxdl.xml # contributed_definitions/NXimage_r_set.nxdl.xml # contributed_definitions/NXimage_set.nxdl.xml # contributed_definitions/NXinteraction_vol_em.nxdl.xml # contributed_definitions/NXion.nxdl.xml # contributed_definitions/NXms_feature_set.nxdl.xml # contributed_definitions/NXoptical_system_em.nxdl.xml # contributed_definitions/NXpump.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXscanbox_em.nxdl.xml # contributed_definitions/NXserialized.nxdl.xml # contributed_definitions/NXspectrum_set.nxdl.xml # contributed_definitions/NXxrd.nxdl.xml # contributed_definitions/NXxrd_pan.nxdl.xml # contributed_definitions/nyaml/NXem.yaml # contributed_definitions/nyaml/NXem_base.yaml
# Conflicts: # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXapm_charge_state_analysis.nxdl.xml # contributed_definitions/NXapm_hit_finding.nxdl.xml # contributed_definitions/NXapm_paraprobe_clusterer_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_clusterer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_distancer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_intersector_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_intersector_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_nanochem_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_nanochem_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_ranger_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_selector_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_spatstat_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_spatstat_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_surfacer_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_surfacer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tessellator_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tool_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_transcoder_results.nxdl.xml # contributed_definitions/NXapm_ranging.nxdl.xml # contributed_definitions/NXapm_reconstruction.nxdl.xml # contributed_definitions/NXapm_volt_and_bowl.nxdl.xml # contributed_definitions/NXcg_cylinder_set.nxdl.xml # contributed_definitions/NXcg_face_list_data_structure.nxdl.xml # contributed_definitions/NXcg_hexahedron_set.nxdl.xml # contributed_definitions/NXcg_parallelogram_set.nxdl.xml # contributed_definitions/NXcg_point_set.nxdl.xml # contributed_definitions/NXcg_sphere_set.nxdl.xml # contributed_definitions/NXcorrector_cs.nxdl.xml # contributed_definitions/NXdelocalization.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_ebsd.nxdl.xml # contributed_definitions/NXem_eds.nxdl.xml # contributed_definitions/NXevent_data_apm.nxdl.xml # contributed_definitions/NXgraph_edge_set.nxdl.xml # contributed_definitions/NXimage_c_set.nxdl.xml # contributed_definitions/NXimage_r_set.nxdl.xml # contributed_definitions/NXion.nxdl.xml # contributed_definitions/NXms_feature_set.nxdl.xml # contributed_definitions/NXoptical_system_em.nxdl.xml # contributed_definitions/NXpulser_apm.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXscanbox_em.nxdl.xml # contributed_definitions/NXsimilarity_grouping.nxdl.xml # contributed_definitions/NXspectrum_set.nxdl.xml
* Pin nyaml==0.0.8 * Regenerate nxdls # Conflicts: # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXapm_charge_state_analysis.nxdl.xml # contributed_definitions/NXapm_hit_finding.nxdl.xml # contributed_definitions/NXapm_paraprobe_clusterer_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_clusterer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_distancer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_intersector_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_intersector_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_nanochem_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_nanochem_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_ranger_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_selector_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_spatstat_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_spatstat_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_surfacer_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_surfacer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tessellator_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tool_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_transcoder_results.nxdl.xml # contributed_definitions/NXapm_ranging.nxdl.xml # contributed_definitions/NXapm_reconstruction.nxdl.xml # contributed_definitions/NXapm_volt_and_bowl.nxdl.xml # contributed_definitions/NXcg_cylinder_set.nxdl.xml # contributed_definitions/NXcg_face_list_data_structure.nxdl.xml # contributed_definitions/NXcg_hexahedron_set.nxdl.xml # contributed_definitions/NXcg_parallelogram_set.nxdl.xml # contributed_definitions/NXcg_point_set.nxdl.xml # contributed_definitions/NXcg_sphere_set.nxdl.xml # contributed_definitions/NXcorrector_cs.nxdl.xml # contributed_definitions/NXdelocalization.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_ebsd.nxdl.xml # contributed_definitions/NXem_eds.nxdl.xml # contributed_definitions/NXevent_data_apm.nxdl.xml # contributed_definitions/NXgraph_edge_set.nxdl.xml # contributed_definitions/NXimage_c_set.nxdl.xml # contributed_definitions/NXimage_r_set.nxdl.xml # contributed_definitions/NXion.nxdl.xml # contributed_definitions/NXms_feature_set.nxdl.xml # contributed_definitions/NXoptical_system_em.nxdl.xml # contributed_definitions/NXpulser_apm.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXscanbox_em.nxdl.xml # contributed_definitions/NXsimilarity_grouping.nxdl.xml # contributed_definitions/NXspectrum_set.nxdl.xml # contributed_definitions/NXstage_lab.nxdl.xml # contributed_definitions/NXsubsampling_filter.nxdl.xml
# 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_charge_state_analysis.nxdl.xml # base_classes/NXapm_hit_finding.nxdl.xml # base_classes/NXapm_msr.nxdl.xml # base_classes/NXapm_ranging.nxdl.xml # base_classes/NXapm_reconstruction.nxdl.xml # base_classes/NXapm_sim.nxdl.xml # base_classes/NXapm_volt_and_bowl.nxdl.xml # base_classes/NXbeam_device.nxdl.xml # base_classes/NXbeam_transfer_matrix_table.nxdl.xml # base_classes/NXcg_cylinder_set.nxdl.xml # base_classes/NXcg_ellipsoid_set.nxdl.xml # base_classes/NXcg_face_list_data_structure.nxdl.xml # base_classes/NXcg_hexahedron_set.nxdl.xml # base_classes/NXcg_parallelogram_set.nxdl.xml # base_classes/NXcg_point_set.nxdl.xml # base_classes/NXcg_polygon_set.nxdl.xml # base_classes/NXcg_polyhedron_set.nxdl.xml # base_classes/NXcg_primitive_set.nxdl.xml # base_classes/NXcg_sphere_set.nxdl.xml # base_classes/NXcg_tetrahedron_set.nxdl.xml # base_classes/NXcg_triangle_set.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/NXdata_mpes.nxdl.xml # base_classes/NXdata_mpes_detector.nxdl.xml # base_classes/NXelectron_level.nxdl.xml # base_classes/NXem_eds.nxdl.xml # base_classes/NXevent_data_apm.nxdl.xml # base_classes/NXevent_data_apm_set.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/NXphysical_process.nxdl.xml # base_classes/NXprocess_mpes.nxdl.xml # base_classes/NXprogram.nxdl.xml # base_classes/NXregistration.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/NXadc.nxdl.xml # contributed_definitions/NXaperture_em.nxdl.xml # contributed_definitions/NXapm_sim.nxdl.xml # contributed_definitions/NXcs_cpu_obj.nxdl.xml # contributed_definitions/NXcs_cpu_sys.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/NXms_snapshot.nxdl.xml # contributed_definitions/NXprogram.nxdl.xml # contributed_definitions/NXregistration.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
* Refactored cg_primitive base classes for two key aspects: i) make all primitives inherit from new base class NXcg_primitive_set which makes a substantial number of repeated properties of specialized primitive base classes unnecessary, ii) introducing a rigorous mathematical set theoretical approach to describe the number type N, N0, Z, R, R+, R, iii) introduce short hand notation to reduce writing costs for shape/dimensions of arrays: now numpy syntax is used, for scalars (), (1, can be omitted, experience in FAIRmat has shown that in almost all cases the optional doc string to a dimension was almost never used and thus yaml based descriptions can be written more succinct, iv) proof-read docstrings and shortened them, introduced the suggestion to use info: as a keyword which should for now be just appended to the docstring as usual but in the future should be treated as a comment, i.e. only meant for human contextualization but ignored for semantic interpretation of concepts, a key difference that I hope this will bring is to reduce also the length of base classes and appdef as they show up in html pages, specifically for appdefs like NXem many of the conceptual ideas which these docstrings currently contain would be much better placed in a proper documentation instead of the actual class definition in the hope that the overall appearance of classes becomes easier and faster for people to power read; maybe this also works against some criticism that NeXus is considered complex, I have to say with the outsourcing of NXcg_primitive_set I feel it is damn simple now * Refactoring of NXcs base classes * First lot of refactoring EM base classes, the rest tomorrow, NXapm will not be refactored before the APT&M2023 conference in Sept2023, also because feedback from Leoben was positive enough that no immediate changes wrt to appdefs and base classes were required * Summarize the current state of the discussion about coordinate systems with the proposed NXcoordinate_system and NXcoordinate_system_set base classes and best practice recommendations how they should be used including feedback from discussions with Florian Dobner and Tamás Haraszti * Summary of the discussion how to handle conventions and method-specific conventions for EM and methods used in EM * Base classes for implemented examples for pole figures, orientation distribution function, event_data, stage_lab, and ebsd_crystal_structure_model * NXms_ipf base class and dos2unix to correct newlines * Introducing NXem_method base class as a template how to write method-specific deep base classes to describe the terms and taxononmy of method-specific branches to be hooked into appdefs like NXem * Base class inheritance proposal for a now even stronger modularized schema set for electron microscopy research, two tasks remain: i) refactor what is now a method-specific instance rather than an appdef (NXem_ebsd) (mainly to be able to fuse all examples of em-specific data converters including new ebsd examples into one em parser for pynxtools), ii) refactor NXem which is now clearly a specific appdef specializing the NXem_base deep base class, specialization work needs to define which fields and groups from all the possible ones now composable via base classes (inheritance) are required in an appdef NXem for NOMAD OASIS * NXem_ebsd refactored into a base class to use it as a method-specific group inside the NXem application definition, next step: i) refactor NXem_sim, ii) finalize refactoring of NXem appdef (for Nomad oasis) * finished draft of NXem_ebsd, NXem_correlation, and NXem appdef, cleaning the branch * Add proposal for storing mtx cfg, fixed nxtime datatypes * 2d microstructure projection * Inspection how proposed, info, N0, N, R, Z value type abbreviations, and dimensions could be added to nyamlforward * A likely too simplistic but at least working nyaml2nxdl forward mapping to explore further usage of refactored EM base classes. Info keyword has to be a child of doc or the respective text be removed from the standard and put into proposal-specific documentation, how to store what and where so that the schema docstring remain succinct and slim but all these conceptual ideas get not forgotten, typically the would be part of a tech report, i.e. in my opinion all what is under info: sections of a docstring should move to some documentation to tell the story to humans, next test these NXDLs with the NeXus documentation system * Minor fix to handle info keyword spotted while compiling the documentation * Fixes to compile with NeXus documentation test suite and sphinx * Deactivated the annoying clean yaml via make clean for dev purposes * Minor fix in em_base, this completes the appdef/base class work for now on the refactored EM, there are still some spurious info fields now, which should be removed when a decision has been made wrt to how to deal with info: keyword fields in general, next steps: i) make decision on info, ii) test refactored EM proposal with pynxtools em-parser v2, iii) implement backwards * Styling via black * Added yaml2nxdl-forward-converted NXDL files to all refactored base classes and the refactored NXem * Added NXroot header for the em appdef and its base template appdef * Continuing the refactoring of EM and APM plus related base classes for CG and MS based on suggestions from user meetings, discussions with Sandor, represents work with the MPES sprint #83 * Continuing on #83 * Continuing #83, NXcs_* * Continuing #83, ipf, pf, odf * Continuing on #83, support classes for EM * Continued on #83, coordinate system, further base classes supporting EM * Continuing #83, event_data_set and event_data description substantially condensed amongst other points * Added cross-references to base classes for rst, continuing #83 * Aligned old NXem_ebsd_conventions with NXcoordinate_system for #83 * Reviewed method-specific base classes, ebsd, eds, eels, #83 * #83, NXms_recon * #83, composed constraints on the NXem appdef * Consolidated with changes that happened in between on the fairmat branch based on 1016aa0, NXms_recon has still an issue and is therefore deactivated currently, method-specific landing pages need to be updated * Consolidated further with fairmat 15624c0 * Fixing some missing references * Fixed syntax error to compile NXms_recon, docs building also now, reviewing intro pages remains * Consistencies of dimensionality to use NX_POSINT and an enumeration * Recompiled NXDL files using new nyaml module 3d500ced7e4ca57683957c1d61a8d0cb62eccf53, removed, modified by taking the one from fairmat, and synced all files which were binarily different between this feature branch and the fairmat branch specifically commit a15798b of the fairmat branch * Deactivated em-based tests which because of a refactoring of em are not expected to work anymore * Fix improper Latex notation in math environment for polyline, face_list, nanochem * Added recompiled NXidentifier, NXserialized NXDLs which triggered pipeline errors in CatChen gh action * Some round of proof-reading * Fixed test_nxdl_utils to reflect and use refactored locations of refactored NXem * Added feedback from @phyy-nx, @PeterC-DLS, and @prjemian from discussed here https://github.com/nexusformat/definitions PR nexusformat#1271 * Black formatting * Reactivated data type check for e.g. NXem NX_NUMBER * Implementing NX_DATE_TIME suggestion of @sanbrock --------- Co-authored-by: markus.kuehbach <[email protected]> # Conflicts: # applications/NXapm.nxdl.xml # applications/NXem.nxdl.xml # base_classes/NXaberration.nxdl.xml # base_classes/NXcg_alpha_complex.nxdl.xml # base_classes/NXcg_cylinder_set.nxdl.xml # base_classes/NXcg_ellipsoid_set.nxdl.xml # base_classes/NXcg_face_list_data_structure.nxdl.xml # base_classes/NXcg_geodesic_mesh.nxdl.xml # base_classes/NXcg_grid.nxdl.xml # base_classes/NXcg_half_edge_data_structure.nxdl.xml # base_classes/NXcg_hexahedron_set.nxdl.xml # base_classes/NXcg_marching_cubes.nxdl.xml # base_classes/NXcg_parallelogram_set.nxdl.xml # base_classes/NXcg_point_set.nxdl.xml # base_classes/NXcg_polygon_set.nxdl.xml # base_classes/NXcg_polyhedron_set.nxdl.xml # base_classes/NXcg_polyline_set.nxdl.xml # base_classes/NXcg_sphere_set.nxdl.xml # base_classes/NXcg_tetrahedron_set.nxdl.xml # base_classes/NXcg_triangle_set.nxdl.xml # base_classes/NXcg_triangulated_surface_mesh.nxdl.xml # base_classes/NXcg_unit_normal_set.nxdl.xml # base_classes/NXchamber.nxdl.xml # base_classes/NXcoordinate_system_set.nxdl.xml # base_classes/NXcorrector_cs.nxdl.xml # base_classes/NXcs_computer.nxdl.xml # base_classes/NXcs_filter_boolean_mask.nxdl.xml # base_classes/NXcs_prng.nxdl.xml # base_classes/NXcs_profiling.nxdl.xml # base_classes/NXcs_profiling_event.nxdl.xml # base_classes/NXdeflector.nxdl.xml # base_classes/NXebeam_column.nxdl.xml # base_classes/NXem_ebsd.nxdl.xml # base_classes/NXevent_data_em.nxdl.xml # base_classes/NXevent_data_em_set.nxdl.xml # base_classes/NXfabrication.nxdl.xml # base_classes/NXibeam_column.nxdl.xml # base_classes/NXimage_set.nxdl.xml # base_classes/NXion.nxdl.xml # base_classes/NXlens_em.nxdl.xml # base_classes/NXoptical_system_em.nxdl.xml # base_classes/NXpump.nxdl.xml # base_classes/NXscanbox_em.nxdl.xml # base_classes/NXspectrum_set.nxdl.xml # base_classes/NXstage_lab.nxdl.xml # contributed_definitions/NXaberration_model.nxdl.xml # contributed_definitions/NXaberration_model_ceos.nxdl.xml # contributed_definitions/NXaberration_model_nion.nxdl.xml # contributed_definitions/NXaperture_em.nxdl.xml # contributed_definitions/NXapm_paraprobe_results_nanochem.nxdl.xml # contributed_definitions/NXcomponent_em.nxdl.xml # contributed_definitions/NXcs_gpu_obj.nxdl.xml # contributed_definitions/NXcs_gpu_sys.nxdl.xml # contributed_definitions/NXcs_io_obj.nxdl.xml # contributed_definitions/NXcs_io_sys.nxdl.xml # contributed_definitions/NXcs_mm_sys.nxdl.xml # contributed_definitions/NXem_adf.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_conventions_ebsd.nxdl.xml # contributed_definitions/NXem_ebsd_crystal_structure_model.nxdl.xml # contributed_definitions/NXgraph_edge_set.nxdl.xml # contributed_definitions/NXgraph_node_set.nxdl.xml # contributed_definitions/NXgraph_root.nxdl.xml # contributed_definitions/NXimage_r_set_diff.nxdl.xml # contributed_definitions/NXimage_set_em_adf.nxdl.xml # contributed_definitions/NXimage_set_em_kikuchi.nxdl.xml # contributed_definitions/NXinteraction_vol_em.nxdl.xml # contributed_definitions/NXisocontour.nxdl.xml # contributed_definitions/NXms.nxdl.xml # contributed_definitions/NXms_feature_set.nxdl.xml # contributed_definitions/NXms_ipf.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/NXms_score_results.nxdl.xml # contributed_definitions/NXorientation_set.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXspectrum_set_em_eels.nxdl.xml # contributed_definitions/NXspectrum_set_em_xray.nxdl.xml # contributed_definitions/nyaml/NXaberration.yaml # contributed_definitions/nyaml/NXaberration_model.yaml # contributed_definitions/nyaml/NXaberration_model_ceos.yaml # contributed_definitions/nyaml/NXaberration_model_nion.yaml # contributed_definitions/nyaml/NXaperture_em.yaml # contributed_definitions/nyaml/NXapm.yaml # contributed_definitions/nyaml/NXapm_paraprobe_results_nanochem.yaml # contributed_definitions/nyaml/NXcg_alpha_complex.yaml # contributed_definitions/nyaml/NXcg_cylinder_set.yaml # contributed_definitions/nyaml/NXcg_ellipsoid_set.yaml # contributed_definitions/nyaml/NXcg_face_list_data_structure.yaml # contributed_definitions/nyaml/NXcg_geodesic_mesh.yaml # contributed_definitions/nyaml/NXcg_grid.yaml # contributed_definitions/nyaml/NXcg_half_edge_data_structure.yaml # contributed_definitions/nyaml/NXcg_hexahedron_set.yaml # contributed_definitions/nyaml/NXcg_marching_cubes.yaml # contributed_definitions/nyaml/NXcg_parallelogram_set.yaml # contributed_definitions/nyaml/NXcg_point_set.yaml # contributed_definitions/nyaml/NXcg_polygon_set.yaml # contributed_definitions/nyaml/NXcg_polyhedron_set.yaml # contributed_definitions/nyaml/NXcg_polyline_set.yaml # contributed_definitions/nyaml/NXcg_roi_set.yaml # contributed_definitions/nyaml/NXcg_sphere_set.yaml # contributed_definitions/nyaml/NXcg_tetrahedron_set.yaml # contributed_definitions/nyaml/NXcg_triangle_set.yaml # contributed_definitions/nyaml/NXcg_triangulated_surface_mesh.yaml # contributed_definitions/nyaml/NXcg_unit_normal_set.yaml # contributed_definitions/nyaml/NXchamber.yaml # contributed_definitions/nyaml/NXcoordinate_system_set.yaml # contributed_definitions/nyaml/NXcorrector_cs.yaml # contributed_definitions/nyaml/NXcs_computer.yaml # contributed_definitions/nyaml/NXcs_filter_boolean_mask.yaml # contributed_definitions/nyaml/NXcs_io_obj.yaml # contributed_definitions/nyaml/NXcs_io_sys.yaml # contributed_definitions/nyaml/NXcs_mm_sys.yaml # contributed_definitions/nyaml/NXcs_prng.yaml # contributed_definitions/nyaml/NXcs_profiling.yaml # contributed_definitions/nyaml/NXcs_profiling_event.yaml # contributed_definitions/nyaml/NXdeflector.yaml # contributed_definitions/nyaml/NXebeam_column.yaml # contributed_definitions/nyaml/NXem.yaml # contributed_definitions/nyaml/NXem_ebsd.yaml # contributed_definitions/nyaml/NXevent_data_em.yaml # contributed_definitions/nyaml/NXevent_data_em_set.yaml # contributed_definitions/nyaml/NXfabrication.yaml # contributed_definitions/nyaml/NXgraph_edge_set.yaml # contributed_definitions/nyaml/NXgraph_node_set.yaml # contributed_definitions/nyaml/NXgraph_root.yaml # contributed_definitions/nyaml/NXibeam_column.yaml # contributed_definitions/nyaml/NXimage_set.yaml # contributed_definitions/nyaml/NXinteraction_vol_em.yaml # contributed_definitions/nyaml/NXion.yaml # contributed_definitions/nyaml/NXisocontour.yaml # contributed_definitions/nyaml/NXlens_em.yaml # contributed_definitions/nyaml/NXms.yaml # contributed_definitions/nyaml/NXms_feature_set.yaml # contributed_definitions/nyaml/NXms_score_results.yaml # contributed_definitions/nyaml/NXoptical_system_em.yaml # contributed_definitions/nyaml/NXpump.yaml # contributed_definitions/nyaml/NXrotation_set.yaml # contributed_definitions/nyaml/NXscanbox_em.yaml # contributed_definitions/nyaml/NXspectrum_set.yaml # contributed_definitions/nyaml/NXstage_lab.yaml # dev_tools/tests/test_nxdl_utils.py # manual/source/classes/contributed_definitions/cgms-structure.rst # manual/source/classes/contributed_definitions/em-structure.rst # manual/source/classes/contributed_definitions/icme-structure.rst
# Conflicts: # base_classes/NXcg_roi_set.nxdl.xml # base_classes/NXem_img.nxdl.xml # base_classes/NXem_method.nxdl.xml # base_classes/NXroi.nxdl.xml # base_classes/NXroot.nxdl.xml # contributed_definitions/NXaberration.nxdl.xml # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXcalibration.nxdl.xml # contributed_definitions/NXchamber.nxdl.xml # contributed_definitions/NXcollectioncolumn.nxdl.xml # contributed_definitions/NXcomponent_em.nxdl.xml # contributed_definitions/NXcoordinate_system_set.nxdl.xml # contributed_definitions/NXcorrector_cs.nxdl.xml # contributed_definitions/NXcs_computer.nxdl.xml # contributed_definitions/NXcs_filter_boolean_mask.nxdl.xml # contributed_definitions/NXcs_gpu_obj.nxdl.xml # contributed_definitions/NXcs_prng.nxdl.xml # contributed_definitions/NXcs_profiling.nxdl.xml # contributed_definitions/NXcs_profiling_event.nxdl.xml # contributed_definitions/NXdeflector.nxdl.xml # contributed_definitions/NXebeam_column.nxdl.xml # contributed_definitions/NXelectronanalyser.nxdl.xml # contributed_definitions/NXem.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_conventions_ebsd.nxdl.xml # contributed_definitions/NXem_ebsd.nxdl.xml # contributed_definitions/NXenergydispersion.nxdl.xml # contributed_definitions/NXevent_data_em.nxdl.xml # contributed_definitions/NXevent_data_em_set.nxdl.xml # contributed_definitions/NXfabrication.nxdl.xml # contributed_definitions/NXibeam_column.nxdl.xml # contributed_definitions/NXidentifier.nxdl.xml # contributed_definitions/NXimage_r_set_diff.nxdl.xml # contributed_definitions/NXimage_set.nxdl.xml # contributed_definitions/NXinteraction_vol_em.nxdl.xml # contributed_definitions/NXion.nxdl.xml # contributed_definitions/NXlens_em.nxdl.xml # contributed_definitions/NXmpes.nxdl.xml # contributed_definitions/NXms_ipf.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_recon.nxdl.xml # contributed_definitions/NXoptical_system_em.nxdl.xml # contributed_definitions/NXpump.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXscanbox_em.nxdl.xml # contributed_definitions/NXserialized.nxdl.xml # contributed_definitions/NXspectrum_set.nxdl.xml # contributed_definitions/NXstage_lab.nxdl.xml # contributed_definitions/NXxrd.nxdl.xml # contributed_definitions/NXxrd_pan.nxdl.xml
# Conflicts: # base_classes/NXroot.nxdl.xml # contributed_definitions/NXcomponent_em.nxdl.xml # contributed_definitions/NXcs_gpu_obj.nxdl.xml # contributed_definitions/NXcs_gpu_sys.nxdl.xml # contributed_definitions/NXem_adf.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_conventions_ebsd.nxdl.xml # contributed_definitions/NXidentifier.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_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/NXrotation_set.nxdl.xml # contributed_definitions/NXserialized.nxdl.xml # contributed_definitions/NXxrd.nxdl.xml # contributed_definitions/NXxrd_pan.nxdl.xml
…s 0572bfa9df6f513325024185ed1f1c1901d0758c # Conflicts: # base_classes/NXpeak.nxdl.xml # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXapm_charge_state_analysis.nxdl.xml # contributed_definitions/NXapm_hit_finding.nxdl.xml # contributed_definitions/NXapm_msr.nxdl.xml # contributed_definitions/NXapm_paraprobe_ranger_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_ranger_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tool_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_tool_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_transcoder_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_transcoder_results.nxdl.xml # contributed_definitions/NXapm_ranging.nxdl.xml # contributed_definitions/NXapm_reconstruction.nxdl.xml # contributed_definitions/NXapm_sim.nxdl.xml # contributed_definitions/NXapm_volt_and_bowl.nxdl.xml # contributed_definitions/NXcomponent_em.nxdl.xml # contributed_definitions/NXcs_gpu_obj.nxdl.xml # contributed_definitions/NXcs_gpu_sys.nxdl.xml # contributed_definitions/NXem_adf.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_conventions_ebsd.nxdl.xml # contributed_definitions/NXevent_data_apm.nxdl.xml # contributed_definitions/NXevent_data_apm_set.nxdl.xml # contributed_definitions/NXidentifier.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_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/NXpulser_apm.nxdl.xml # contributed_definitions/NXreflectron.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXserialized.nxdl.xml # contributed_definitions/NXxrd.nxdl.xml # contributed_definitions/NXxrd_pan.nxdl.xml # contributed_definitions/nyaml/NXapm.yaml # contributed_definitions/nyaml/NXapm_charge_state_analysis.yaml # contributed_definitions/nyaml/NXapm_hit_finding.yaml # contributed_definitions/nyaml/NXapm_ranging.yaml # contributed_definitions/nyaml/NXapm_reconstruction.yaml # contributed_definitions/nyaml/NXapm_volt_and_bowl.yaml # contributed_definitions/nyaml/NXevent_data_apm.yaml # contributed_definitions/nyaml/NXpeak.yaml
# Conflicts: # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXapm_charge_state_analysis.nxdl.xml # contributed_definitions/NXapm_hit_finding.nxdl.xml # contributed_definitions/NXapm_paraprobe_clusterer_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_clusterer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_distancer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_intersector_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_intersector_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_nanochem_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_nanochem_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_ranger_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_selector_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_spatstat_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_spatstat_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_surfacer_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_surfacer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tessellator_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tool_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_transcoder_results.nxdl.xml # contributed_definitions/NXapm_ranging.nxdl.xml # contributed_definitions/NXapm_reconstruction.nxdl.xml # contributed_definitions/NXapm_volt_and_bowl.nxdl.xml # contributed_definitions/NXcorrector_cs.nxdl.xml # contributed_definitions/NXdelocalization.nxdl.xml # contributed_definitions/NXem_adf.nxdl.xml # contributed_definitions/NXem_base.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_conventions_ebsd.nxdl.xml # contributed_definitions/NXem_ebsd.nxdl.xml # contributed_definitions/NXem_eds.nxdl.xml # contributed_definitions/NXevent_data_apm.nxdl.xml # contributed_definitions/NXgraph_edge_set.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/NXion.nxdl.xml # contributed_definitions/NXms_feature_set.nxdl.xml # contributed_definitions/NXms_ipf.nxdl.xml # contributed_definitions/NXms_mtex_config.nxdl.xml # contributed_definitions/NXms_odf.nxdl.xml # contributed_definitions/NXms_pf.nxdl.xml # contributed_definitions/NXms_recon.nxdl.xml # contributed_definitions/NXoptical_system_em.nxdl.xml # contributed_definitions/NXpeak.nxdl.xml # contributed_definitions/NXpulser_apm.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXsimilarity_grouping.nxdl.xml # contributed_definitions/NXspectrum_set.nxdl.xml
…s 0572bfa9df6f513325024185ed1f1c1901d0758c # Conflicts: # base_classes/NXpeak.nxdl.xml # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXapm_paraprobe_ranger_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tool_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_transcoder_results.nxdl.xml # contributed_definitions/NXapm_sim.nxdl.xml # contributed_definitions/NXcs_gpu_obj.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXfabrication.nxdl.xml # contributed_definitions/NXidentifier.nxdl.xml # contributed_definitions/NXimage_set.nxdl.xml # contributed_definitions/NXinteraction_vol_em.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXserialized.nxdl.xml # contributed_definitions/NXxrd.nxdl.xml # contributed_definitions/NXxrd_pan.nxdl.xml # contributed_definitions/nyaml/NXapm.yaml # contributed_definitions/nyaml/NXapm_charge_state_analysis.yaml # contributed_definitions/nyaml/NXapm_hit_finding.yaml # contributed_definitions/nyaml/NXapm_ranging.yaml # contributed_definitions/nyaml/NXapm_reconstruction.yaml # contributed_definitions/nyaml/NXapm_volt_and_bowl.yaml # contributed_definitions/nyaml/NXevent_data_apm.yaml # contributed_definitions/nyaml/NXpeak.yaml
# Conflicts: # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXapm_paraprobe_clusterer_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_clusterer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_distancer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_intersector_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_intersector_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_nanochem_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_nanochem_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_ranger_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_selector_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_spatstat_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_spatstat_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_surfacer_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_surfacer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tessellator_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tool_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_transcoder_results.nxdl.xml # contributed_definitions/NXcg_face_list_data_structure.nxdl.xml # contributed_definitions/NXcg_hexahedron_set.nxdl.xml # contributed_definitions/NXcg_parallelogram_set.nxdl.xml # contributed_definitions/NXcg_point_set.nxdl.xml # contributed_definitions/NXcorrector_cs.nxdl.xml # contributed_definitions/NXdelocalization.nxdl.xml # contributed_definitions/NXem_base.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_ebsd.nxdl.xml # contributed_definitions/NXem_eds.nxdl.xml # contributed_definitions/NXgraph_edge_set.nxdl.xml # contributed_definitions/NXimage_c_set.nxdl.xml # contributed_definitions/NXimage_r_set.nxdl.xml # contributed_definitions/NXion.nxdl.xml # contributed_definitions/NXms_feature_set.nxdl.xml # contributed_definitions/NXoptical_system_em.nxdl.xml # contributed_definitions/NXpeak.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXspectrum_set.nxdl.xml
# Conflicts: # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXcg_ellipsoid_set.nxdl.xml # contributed_definitions/NXcg_face_list_data_structure.nxdl.xml # contributed_definitions/NXcg_hexahedron_set.nxdl.xml # contributed_definitions/NXcg_parallelogram_set.nxdl.xml # contributed_definitions/NXcg_point_set.nxdl.xml # contributed_definitions/NXcg_polyhedron_set.nxdl.xml # contributed_definitions/NXcorrector_cs.nxdl.xml # contributed_definitions/NXcs_gpu_obj.nxdl.xml # contributed_definitions/NXem.nxdl.xml # contributed_definitions/NXem_base.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_ebsd.nxdl.xml # contributed_definitions/NXem_eds.nxdl.xml # contributed_definitions/NXfabrication.nxdl.xml # contributed_definitions/NXgraph_edge_set.nxdl.xml # contributed_definitions/NXidentifier.nxdl.xml # contributed_definitions/NXimage_c_set.nxdl.xml # contributed_definitions/NXimage_r_set.nxdl.xml # contributed_definitions/NXimage_set.nxdl.xml # contributed_definitions/NXinteraction_vol_em.nxdl.xml # contributed_definitions/NXion.nxdl.xml # contributed_definitions/NXms_feature_set.nxdl.xml # contributed_definitions/NXoptical_system_em.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXscanbox_em.nxdl.xml # contributed_definitions/NXserialized.nxdl.xml # contributed_definitions/NXspectrum_set.nxdl.xml # contributed_definitions/NXxrd.nxdl.xml # contributed_definitions/NXxrd_pan.nxdl.xml # contributed_definitions/nyaml/NXem.yaml # contributed_definitions/nyaml/NXem_base.yaml
# Conflicts: # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXapm_paraprobe_clusterer_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_clusterer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_distancer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_intersector_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_intersector_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_nanochem_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_nanochem_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_ranger_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_selector_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_spatstat_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_spatstat_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_surfacer_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_surfacer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tessellator_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tool_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_transcoder_results.nxdl.xml # contributed_definitions/NXcg_face_list_data_structure.nxdl.xml # contributed_definitions/NXcg_hexahedron_set.nxdl.xml # contributed_definitions/NXcg_parallelogram_set.nxdl.xml # contributed_definitions/NXcg_point_set.nxdl.xml # contributed_definitions/NXcorrector_cs.nxdl.xml # contributed_definitions/NXdelocalization.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_ebsd.nxdl.xml # contributed_definitions/NXem_eds.nxdl.xml # contributed_definitions/NXgraph_edge_set.nxdl.xml # contributed_definitions/NXimage_c_set.nxdl.xml # contributed_definitions/NXimage_r_set.nxdl.xml # contributed_definitions/NXion.nxdl.xml # contributed_definitions/NXms_feature_set.nxdl.xml # contributed_definitions/NXoptical_system_em.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXscanbox_em.nxdl.xml # contributed_definitions/NXspectrum_set.nxdl.xml
* Pin nyaml==0.0.8 * Regenerate nxdls # Conflicts: # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXapm_paraprobe_clusterer_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_clusterer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_distancer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_intersector_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_intersector_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_nanochem_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_nanochem_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_ranger_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_selector_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_spatstat_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_spatstat_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_surfacer_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_surfacer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tessellator_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tool_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_transcoder_results.nxdl.xml # contributed_definitions/NXcg_face_list_data_structure.nxdl.xml # contributed_definitions/NXcg_hexahedron_set.nxdl.xml # contributed_definitions/NXcg_parallelogram_set.nxdl.xml # contributed_definitions/NXcg_point_set.nxdl.xml # contributed_definitions/NXcorrector_cs.nxdl.xml # contributed_definitions/NXdelocalization.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_ebsd.nxdl.xml # contributed_definitions/NXem_eds.nxdl.xml # contributed_definitions/NXgraph_edge_set.nxdl.xml # contributed_definitions/NXimage_c_set.nxdl.xml # contributed_definitions/NXimage_r_set.nxdl.xml # contributed_definitions/NXion.nxdl.xml # contributed_definitions/NXms_feature_set.nxdl.xml # contributed_definitions/NXoptical_system_em.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXscanbox_em.nxdl.xml # contributed_definitions/NXspectrum_set.nxdl.xml # contributed_definitions/NXstage_lab.nxdl.xml
# 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/NXdata_mpes.nxdl.xml # base_classes/NXdata_mpes_detector.nxdl.xml # base_classes/NXelectron_level.nxdl.xml # base_classes/NXem_eds.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/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
* Refactored cg_primitive base classes for two key aspects: i) make all primitives inherit from new base class NXcg_primitive_set which makes a substantial number of repeated properties of specialized primitive base classes unnecessary, ii) introducing a rigorous mathematical set theoretical approach to describe the number type N, N0, Z, R, R+, R, iii) introduce short hand notation to reduce writing costs for shape/dimensions of arrays: now numpy syntax is used, for scalars (), (1, can be omitted, experience in FAIRmat has shown that in almost all cases the optional doc string to a dimension was almost never used and thus yaml based descriptions can be written more succinct, iv) proof-read docstrings and shortened them, introduced the suggestion to use info: as a keyword which should for now be just appended to the docstring as usual but in the future should be treated as a comment, i.e. only meant for human contextualization but ignored for semantic interpretation of concepts, a key difference that I hope this will bring is to reduce also the length of base classes and appdef as they show up in html pages, specifically for appdefs like NXem many of the conceptual ideas which these docstrings currently contain would be much better placed in a proper documentation instead of the actual class definition in the hope that the overall appearance of classes becomes easier and faster for people to power read; maybe this also works against some criticism that NeXus is considered complex, I have to say with the outsourcing of NXcg_primitive_set I feel it is damn simple now * Refactoring of NXcs base classes * First lot of refactoring EM base classes, the rest tomorrow, NXapm will not be refactored before the APT&M2023 conference in Sept2023, also because feedback from Leoben was positive enough that no immediate changes wrt to appdefs and base classes were required * Summarize the current state of the discussion about coordinate systems with the proposed NXcoordinate_system and NXcoordinate_system_set base classes and best practice recommendations how they should be used including feedback from discussions with Florian Dobner and Tamás Haraszti * Summary of the discussion how to handle conventions and method-specific conventions for EM and methods used in EM * Base classes for implemented examples for pole figures, orientation distribution function, event_data, stage_lab, and ebsd_crystal_structure_model * NXms_ipf base class and dos2unix to correct newlines * Introducing NXem_method base class as a template how to write method-specific deep base classes to describe the terms and taxononmy of method-specific branches to be hooked into appdefs like NXem * Base class inheritance proposal for a now even stronger modularized schema set for electron microscopy research, two tasks remain: i) refactor what is now a method-specific instance rather than an appdef (NXem_ebsd) (mainly to be able to fuse all examples of em-specific data converters including new ebsd examples into one em parser for pynxtools), ii) refactor NXem which is now clearly a specific appdef specializing the NXem_base deep base class, specialization work needs to define which fields and groups from all the possible ones now composable via base classes (inheritance) are required in an appdef NXem for NOMAD OASIS * NXem_ebsd refactored into a base class to use it as a method-specific group inside the NXem application definition, next step: i) refactor NXem_sim, ii) finalize refactoring of NXem appdef (for Nomad oasis) * finished draft of NXem_ebsd, NXem_correlation, and NXem appdef, cleaning the branch * Add proposal for storing mtx cfg, fixed nxtime datatypes * 2d microstructure projection * Inspection how proposed, info, N0, N, R, Z value type abbreviations, and dimensions could be added to nyamlforward * A likely too simplistic but at least working nyaml2nxdl forward mapping to explore further usage of refactored EM base classes. Info keyword has to be a child of doc or the respective text be removed from the standard and put into proposal-specific documentation, how to store what and where so that the schema docstring remain succinct and slim but all these conceptual ideas get not forgotten, typically the would be part of a tech report, i.e. in my opinion all what is under info: sections of a docstring should move to some documentation to tell the story to humans, next test these NXDLs with the NeXus documentation system * Minor fix to handle info keyword spotted while compiling the documentation * Fixes to compile with NeXus documentation test suite and sphinx * Deactivated the annoying clean yaml via make clean for dev purposes * Minor fix in em_base, this completes the appdef/base class work for now on the refactored EM, there are still some spurious info fields now, which should be removed when a decision has been made wrt to how to deal with info: keyword fields in general, next steps: i) make decision on info, ii) test refactored EM proposal with pynxtools em-parser v2, iii) implement backwards * Styling via black * Added yaml2nxdl-forward-converted NXDL files to all refactored base classes and the refactored NXem * Added NXroot header for the em appdef and its base template appdef * Continuing the refactoring of EM and APM plus related base classes for CG and MS based on suggestions from user meetings, discussions with Sandor, represents work with the MPES sprint #83 * Continuing on #83 * Continuing #83, NXcs_* * Continuing #83, ipf, pf, odf * Continuing on #83, support classes for EM * Continued on #83, coordinate system, further base classes supporting EM * Continuing #83, event_data_set and event_data description substantially condensed amongst other points * Added cross-references to base classes for rst, continuing #83 * Aligned old NXem_ebsd_conventions with NXcoordinate_system for #83 * Reviewed method-specific base classes, ebsd, eds, eels, #83 * #83, NXms_recon * #83, composed constraints on the NXem appdef * Consolidated with changes that happened in between on the fairmat branch based on 1016aa0, NXms_recon has still an issue and is therefore deactivated currently, method-specific landing pages need to be updated * Consolidated further with fairmat 15624c0 * Fixing some missing references * Fixed syntax error to compile NXms_recon, docs building also now, reviewing intro pages remains * Consistencies of dimensionality to use NX_POSINT and an enumeration * Recompiled NXDL files using new nyaml module 3d500ced7e4ca57683957c1d61a8d0cb62eccf53, removed, modified by taking the one from fairmat, and synced all files which were binarily different between this feature branch and the fairmat branch specifically commit a15798b of the fairmat branch * Deactivated em-based tests which because of a refactoring of em are not expected to work anymore * Fix improper Latex notation in math environment for polyline, face_list, nanochem * Added recompiled NXidentifier, NXserialized NXDLs which triggered pipeline errors in CatChen gh action * Some round of proof-reading * Fixed test_nxdl_utils to reflect and use refactored locations of refactored NXem * Added feedback from @phyy-nx, @PeterC-DLS, and @prjemian from discussed here https://github.com/nexusformat/definitions PR nexusformat#1271 * Black formatting * Reactivated data type check for e.g. NXem NX_NUMBER * Implementing NX_DATE_TIME suggestion of @sanbrock --------- Co-authored-by: markus.kuehbach <[email protected]> # Conflicts: # applications/NXapm.nxdl.xml # applications/NXem.nxdl.xml # base_classes/NXaberration.nxdl.xml # base_classes/NXcg_alpha_complex.nxdl.xml # base_classes/NXcg_cylinder_set.nxdl.xml # base_classes/NXcg_geodesic_mesh.nxdl.xml # base_classes/NXcg_grid.nxdl.xml # base_classes/NXcg_half_edge_data_structure.nxdl.xml # base_classes/NXcg_marching_cubes.nxdl.xml # base_classes/NXcg_polyline_set.nxdl.xml # base_classes/NXcg_triangulated_surface_mesh.nxdl.xml # base_classes/NXcg_unit_normal_set.nxdl.xml # base_classes/NXchamber.nxdl.xml # base_classes/NXcoordinate_system_set.nxdl.xml # base_classes/NXcorrector_cs.nxdl.xml # base_classes/NXcs_computer.nxdl.xml # base_classes/NXcs_filter_boolean_mask.nxdl.xml # base_classes/NXcs_prng.nxdl.xml # base_classes/NXcs_profiling.nxdl.xml # base_classes/NXcs_profiling_event.nxdl.xml # base_classes/NXdeflector.nxdl.xml # base_classes/NXebeam_column.nxdl.xml # base_classes/NXem_ebsd.nxdl.xml # base_classes/NXevent_data_em.nxdl.xml # base_classes/NXevent_data_em_set.nxdl.xml # base_classes/NXfabrication.nxdl.xml # base_classes/NXibeam_column.nxdl.xml # base_classes/NXimage_set.nxdl.xml # base_classes/NXion.nxdl.xml # base_classes/NXlens_em.nxdl.xml # base_classes/NXoptical_system_em.nxdl.xml # base_classes/NXpump.nxdl.xml # base_classes/NXscanbox_em.nxdl.xml # base_classes/NXspectrum_set.nxdl.xml # base_classes/NXstage_lab.nxdl.xml # contributed_definitions/NXaberration_model.nxdl.xml # contributed_definitions/NXaberration_model_ceos.nxdl.xml # contributed_definitions/NXaberration_model_nion.nxdl.xml # contributed_definitions/NXaperture_em.nxdl.xml # contributed_definitions/NXapm_paraprobe_results_nanochem.nxdl.xml # contributed_definitions/NXcg_ellipsoid_set.nxdl.xml # contributed_definitions/NXcg_face_list_data_structure.nxdl.xml # contributed_definitions/NXcg_hexahedron_set.nxdl.xml # contributed_definitions/NXcg_parallelogram_set.nxdl.xml # contributed_definitions/NXcg_point_set.nxdl.xml # contributed_definitions/NXcg_polygon_set.nxdl.xml # contributed_definitions/NXcg_polyhedron_set.nxdl.xml # contributed_definitions/NXcg_sphere_set.nxdl.xml # contributed_definitions/NXcg_tetrahedron_set.nxdl.xml # contributed_definitions/NXcg_triangle_set.nxdl.xml # contributed_definitions/NXcomponent_em.nxdl.xml # contributed_definitions/NXcs_gpu_sys.nxdl.xml # contributed_definitions/NXcs_io_obj.nxdl.xml # contributed_definitions/NXcs_io_sys.nxdl.xml # contributed_definitions/NXcs_mm_sys.nxdl.xml # contributed_definitions/NXem_adf.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_conventions_ebsd.nxdl.xml # contributed_definitions/NXem_ebsd_crystal_structure_model.nxdl.xml # contributed_definitions/NXgraph_edge_set.nxdl.xml # contributed_definitions/NXgraph_node_set.nxdl.xml # contributed_definitions/NXgraph_root.nxdl.xml # contributed_definitions/NXimage_r_set_diff.nxdl.xml # contributed_definitions/NXimage_set_em_adf.nxdl.xml # contributed_definitions/NXimage_set_em_kikuchi.nxdl.xml # contributed_definitions/NXinteraction_vol_em.nxdl.xml # contributed_definitions/NXisocontour.nxdl.xml # contributed_definitions/NXms.nxdl.xml # contributed_definitions/NXms_feature_set.nxdl.xml # contributed_definitions/NXms_ipf.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/NXms_score_results.nxdl.xml # contributed_definitions/NXorientation_set.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXspectrum_set_em_eels.nxdl.xml # contributed_definitions/NXspectrum_set_em_xray.nxdl.xml # contributed_definitions/nyaml/NXaberration.yaml # contributed_definitions/nyaml/NXaberration_model.yaml # contributed_definitions/nyaml/NXaberration_model_ceos.yaml # contributed_definitions/nyaml/NXaberration_model_nion.yaml # contributed_definitions/nyaml/NXaperture_em.yaml # contributed_definitions/nyaml/NXapm.yaml # contributed_definitions/nyaml/NXapm_paraprobe_results_nanochem.yaml # contributed_definitions/nyaml/NXcg_alpha_complex.yaml # contributed_definitions/nyaml/NXcg_cylinder_set.yaml # contributed_definitions/nyaml/NXcg_ellipsoid_set.yaml # contributed_definitions/nyaml/NXcg_face_list_data_structure.yaml # contributed_definitions/nyaml/NXcg_geodesic_mesh.yaml # contributed_definitions/nyaml/NXcg_grid.yaml # contributed_definitions/nyaml/NXcg_half_edge_data_structure.yaml # contributed_definitions/nyaml/NXcg_hexahedron_set.yaml # contributed_definitions/nyaml/NXcg_marching_cubes.yaml # contributed_definitions/nyaml/NXcg_parallelogram_set.yaml # contributed_definitions/nyaml/NXcg_point_set.yaml # contributed_definitions/nyaml/NXcg_polygon_set.yaml # contributed_definitions/nyaml/NXcg_polyhedron_set.yaml # contributed_definitions/nyaml/NXcg_polyline_set.yaml # contributed_definitions/nyaml/NXcg_roi_set.yaml # contributed_definitions/nyaml/NXcg_sphere_set.yaml # contributed_definitions/nyaml/NXcg_tetrahedron_set.yaml # contributed_definitions/nyaml/NXcg_triangle_set.yaml # contributed_definitions/nyaml/NXcg_triangulated_surface_mesh.yaml # contributed_definitions/nyaml/NXcg_unit_normal_set.yaml # contributed_definitions/nyaml/NXchamber.yaml # contributed_definitions/nyaml/NXcoordinate_system_set.yaml # contributed_definitions/nyaml/NXcorrector_cs.yaml # contributed_definitions/nyaml/NXcs_computer.yaml # contributed_definitions/nyaml/NXcs_filter_boolean_mask.yaml # contributed_definitions/nyaml/NXcs_io_obj.yaml # contributed_definitions/nyaml/NXcs_io_sys.yaml # contributed_definitions/nyaml/NXcs_mm_sys.yaml # contributed_definitions/nyaml/NXcs_prng.yaml # contributed_definitions/nyaml/NXcs_profiling.yaml # contributed_definitions/nyaml/NXcs_profiling_event.yaml # contributed_definitions/nyaml/NXdeflector.yaml # contributed_definitions/nyaml/NXebeam_column.yaml # contributed_definitions/nyaml/NXem.yaml # contributed_definitions/nyaml/NXem_ebsd.yaml # contributed_definitions/nyaml/NXevent_data_em.yaml # contributed_definitions/nyaml/NXevent_data_em_set.yaml # contributed_definitions/nyaml/NXfabrication.yaml # contributed_definitions/nyaml/NXgraph_edge_set.yaml # contributed_definitions/nyaml/NXgraph_node_set.yaml # contributed_definitions/nyaml/NXgraph_root.yaml # contributed_definitions/nyaml/NXibeam_column.yaml # contributed_definitions/nyaml/NXimage_set.yaml # contributed_definitions/nyaml/NXinteraction_vol_em.yaml # contributed_definitions/nyaml/NXion.yaml # contributed_definitions/nyaml/NXisocontour.yaml # contributed_definitions/nyaml/NXlens_em.yaml # contributed_definitions/nyaml/NXms.yaml # contributed_definitions/nyaml/NXms_feature_set.yaml # contributed_definitions/nyaml/NXms_score_results.yaml # contributed_definitions/nyaml/NXoptical_system_em.yaml # contributed_definitions/nyaml/NXpump.yaml # contributed_definitions/nyaml/NXrotation_set.yaml # contributed_definitions/nyaml/NXscanbox_em.yaml # contributed_definitions/nyaml/NXspectrum_set.yaml # contributed_definitions/nyaml/NXstage_lab.yaml # dev_tools/tests/test_nxdl_utils.py # manual/source/classes/contributed_definitions/cgms-structure.rst # manual/source/classes/contributed_definitions/em-structure.rst # manual/source/classes/contributed_definitions/icme-structure.rst
# Conflicts: # base_classes/NXcg_roi_set.nxdl.xml # base_classes/NXem_img.nxdl.xml # base_classes/NXem_method.nxdl.xml # base_classes/NXroi.nxdl.xml # base_classes/NXroot.nxdl.xml # contributed_definitions/NXaberration.nxdl.xml # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXcalibration.nxdl.xml # contributed_definitions/NXchamber.nxdl.xml # contributed_definitions/NXcollectioncolumn.nxdl.xml # contributed_definitions/NXcomponent_em.nxdl.xml # contributed_definitions/NXcoordinate_system_set.nxdl.xml # contributed_definitions/NXcorrector_cs.nxdl.xml # contributed_definitions/NXcs_computer.nxdl.xml # contributed_definitions/NXcs_filter_boolean_mask.nxdl.xml # contributed_definitions/NXcs_prng.nxdl.xml # contributed_definitions/NXcs_profiling.nxdl.xml # contributed_definitions/NXcs_profiling_event.nxdl.xml # contributed_definitions/NXdeflector.nxdl.xml # contributed_definitions/NXebeam_column.nxdl.xml # contributed_definitions/NXelectronanalyser.nxdl.xml # contributed_definitions/NXem.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_conventions_ebsd.nxdl.xml # contributed_definitions/NXem_ebsd.nxdl.xml # contributed_definitions/NXenergydispersion.nxdl.xml # contributed_definitions/NXevent_data_em.nxdl.xml # contributed_definitions/NXevent_data_em_set.nxdl.xml # contributed_definitions/NXibeam_column.nxdl.xml # contributed_definitions/NXidentifier.nxdl.xml # contributed_definitions/NXimage_r_set_diff.nxdl.xml # contributed_definitions/NXimage_set.nxdl.xml # contributed_definitions/NXinteraction_vol_em.nxdl.xml # contributed_definitions/NXion.nxdl.xml # contributed_definitions/NXlens_em.nxdl.xml # contributed_definitions/NXmpes.nxdl.xml # contributed_definitions/NXms_ipf.nxdl.xml # contributed_definitions/NXms_mtex_config.nxdl.xml # contributed_definitions/NXms_odf.nxdl.xml # contributed_definitions/NXms_pf.nxdl.xml # contributed_definitions/NXms_pf_set.nxdl.xml # contributed_definitions/NXms_recon.nxdl.xml # contributed_definitions/NXoptical_system_em.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXscanbox_em.nxdl.xml # contributed_definitions/NXserialized.nxdl.xml # contributed_definitions/NXspectrum_set.nxdl.xml # contributed_definitions/NXstage_lab.nxdl.xml # contributed_definitions/NXxrd.nxdl.xml # contributed_definitions/NXxrd_pan.nxdl.xml
# Conflicts: # base_classes/NXroot.nxdl.xml # contributed_definitions/NXcomponent_em.nxdl.xml # contributed_definitions/NXem_adf.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_conventions_ebsd.nxdl.xml # contributed_definitions/NXidentifier.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_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/NXpump.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXserialized.nxdl.xml # contributed_definitions/NXxrd.nxdl.xml # contributed_definitions/NXxrd_pan.nxdl.xml
…s 0572bfa9df6f513325024185ed1f1c1901d0758c # Conflicts: # base_classes/NXpeak.nxdl.xml # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXapm_paraprobe_ranger_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tool_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_transcoder_results.nxdl.xml # contributed_definitions/NXapm_sim.nxdl.xml # contributed_definitions/NXcomponent_em.nxdl.xml # contributed_definitions/NXem_adf.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_conventions_ebsd.nxdl.xml # contributed_definitions/NXidentifier.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_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/NXpump.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXserialized.nxdl.xml # contributed_definitions/NXxrd.nxdl.xml # contributed_definitions/NXxrd_pan.nxdl.xml # contributed_definitions/nyaml/NXapm.yaml # contributed_definitions/nyaml/NXapm_charge_state_analysis.yaml # contributed_definitions/nyaml/NXapm_hit_finding.yaml # contributed_definitions/nyaml/NXapm_ranging.yaml # contributed_definitions/nyaml/NXapm_reconstruction.yaml # contributed_definitions/nyaml/NXapm_volt_and_bowl.yaml # contributed_definitions/nyaml/NXevent_data_apm.yaml # contributed_definitions/nyaml/NXpeak.yaml
# Conflicts: # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXapm_paraprobe_clusterer_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_clusterer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_distancer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_intersector_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_intersector_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_nanochem_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_nanochem_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_ranger_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_selector_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_spatstat_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_spatstat_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_surfacer_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_surfacer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tessellator_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tool_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_transcoder_results.nxdl.xml # contributed_definitions/NXcg_face_list_data_structure.nxdl.xml # contributed_definitions/NXcg_hexahedron_set.nxdl.xml # contributed_definitions/NXcg_parallelogram_set.nxdl.xml # contributed_definitions/NXcg_point_set.nxdl.xml # contributed_definitions/NXcorrector_cs.nxdl.xml # contributed_definitions/NXdelocalization.nxdl.xml # contributed_definitions/NXem_adf.nxdl.xml # contributed_definitions/NXem_base.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_conventions_ebsd.nxdl.xml # contributed_definitions/NXem_ebsd.nxdl.xml # contributed_definitions/NXem_eds.nxdl.xml # contributed_definitions/NXgraph_edge_set.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/NXion.nxdl.xml # contributed_definitions/NXms_feature_set.nxdl.xml # contributed_definitions/NXms_ipf.nxdl.xml # contributed_definitions/NXms_mtex_config.nxdl.xml # contributed_definitions/NXms_odf.nxdl.xml # contributed_definitions/NXms_pf.nxdl.xml # contributed_definitions/NXms_recon.nxdl.xml # contributed_definitions/NXoptical_system_em.nxdl.xml # contributed_definitions/NXpeak.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXspectrum_set.nxdl.xml
# Conflicts: # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXcg_ellipsoid_set.nxdl.xml # contributed_definitions/NXcg_face_list_data_structure.nxdl.xml # contributed_definitions/NXcg_hexahedron_set.nxdl.xml # contributed_definitions/NXcg_parallelogram_set.nxdl.xml # contributed_definitions/NXcg_point_set.nxdl.xml # contributed_definitions/NXcg_polyhedron_set.nxdl.xml # contributed_definitions/NXcg_sphere_set.nxdl.xml # contributed_definitions/NXcomponent_em.nxdl.xml # contributed_definitions/NXcorrector_cs.nxdl.xml # contributed_definitions/NXem.nxdl.xml # contributed_definitions/NXem_adf.nxdl.xml # contributed_definitions/NXem_base.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_conventions_ebsd.nxdl.xml # contributed_definitions/NXem_ebsd.nxdl.xml # contributed_definitions/NXem_eds.nxdl.xml # contributed_definitions/NXgraph_edge_set.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/NXion.nxdl.xml # contributed_definitions/NXms_feature_set.nxdl.xml # contributed_definitions/NXms_ipf.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/NXoptical_system_em.nxdl.xml # contributed_definitions/NXpump.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXscanbox_em.nxdl.xml # contributed_definitions/NXserialized.nxdl.xml # contributed_definitions/NXspectrum_set.nxdl.xml # contributed_definitions/NXxrd.nxdl.xml # contributed_definitions/NXxrd_pan.nxdl.xml # contributed_definitions/nyaml/NXem.yaml # contributed_definitions/nyaml/NXem_base.yaml
# Conflicts: # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXapm_paraprobe_clusterer_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_clusterer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_distancer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_intersector_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_intersector_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_nanochem_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_nanochem_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_ranger_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_selector_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_spatstat_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_spatstat_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_surfacer_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_surfacer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tessellator_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tool_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_transcoder_results.nxdl.xml # contributed_definitions/NXcg_face_list_data_structure.nxdl.xml # contributed_definitions/NXcg_hexahedron_set.nxdl.xml # contributed_definitions/NXcg_parallelogram_set.nxdl.xml # contributed_definitions/NXcg_point_set.nxdl.xml # contributed_definitions/NXcg_sphere_set.nxdl.xml # contributed_definitions/NXcorrector_cs.nxdl.xml # contributed_definitions/NXdelocalization.nxdl.xml # contributed_definitions/NXem_adf.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_conventions_ebsd.nxdl.xml # contributed_definitions/NXem_ebsd.nxdl.xml # contributed_definitions/NXem_eds.nxdl.xml # contributed_definitions/NXgraph_edge_set.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/NXion.nxdl.xml # contributed_definitions/NXms_feature_set.nxdl.xml # contributed_definitions/NXms_ipf.nxdl.xml # contributed_definitions/NXms_mtex_config.nxdl.xml # contributed_definitions/NXms_odf.nxdl.xml # contributed_definitions/NXms_pf.nxdl.xml # contributed_definitions/NXms_recon.nxdl.xml # contributed_definitions/NXoptical_system_em.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXscanbox_em.nxdl.xml # contributed_definitions/NXspectrum_set.nxdl.xml
* Pin nyaml==0.0.8 * Regenerate nxdls # Conflicts: # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXapm_paraprobe_clusterer_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_clusterer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_distancer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_intersector_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_intersector_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_nanochem_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_nanochem_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_ranger_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_selector_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_spatstat_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_spatstat_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_surfacer_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_surfacer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tessellator_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tool_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_transcoder_results.nxdl.xml # contributed_definitions/NXcg_face_list_data_structure.nxdl.xml # contributed_definitions/NXcg_hexahedron_set.nxdl.xml # contributed_definitions/NXcg_parallelogram_set.nxdl.xml # contributed_definitions/NXcg_point_set.nxdl.xml # contributed_definitions/NXcg_sphere_set.nxdl.xml # contributed_definitions/NXcorrector_cs.nxdl.xml # contributed_definitions/NXdelocalization.nxdl.xml # contributed_definitions/NXem_adf.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_conventions_ebsd.nxdl.xml # contributed_definitions/NXem_ebsd.nxdl.xml # contributed_definitions/NXem_eds.nxdl.xml # contributed_definitions/NXgraph_edge_set.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/NXion.nxdl.xml # contributed_definitions/NXms_feature_set.nxdl.xml # contributed_definitions/NXms_ipf.nxdl.xml # contributed_definitions/NXms_mtex_config.nxdl.xml # contributed_definitions/NXms_odf.nxdl.xml # contributed_definitions/NXms_pf.nxdl.xml # contributed_definitions/NXms_recon.nxdl.xml # contributed_definitions/NXoptical_system_em.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXscanbox_em.nxdl.xml # contributed_definitions/NXspectrum_set.nxdl.xml # contributed_definitions/NXstage_lab.nxdl.xml
# 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/NXcomponent.nxdl.xml # base_classes/NXdata_mpes.nxdl.xml # base_classes/NXdata_mpes_detector.nxdl.xml # base_classes/NXelectron_level.nxdl.xml # base_classes/NXem_eds.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/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
* Refactored cg_primitive base classes for two key aspects: i) make all primitives inherit from new base class NXcg_primitive_set which makes a substantial number of repeated properties of specialized primitive base classes unnecessary, ii) introducing a rigorous mathematical set theoretical approach to describe the number type N, N0, Z, R, R+, R, iii) introduce short hand notation to reduce writing costs for shape/dimensions of arrays: now numpy syntax is used, for scalars (), (1, can be omitted, experience in FAIRmat has shown that in almost all cases the optional doc string to a dimension was almost never used and thus yaml based descriptions can be written more succinct, iv) proof-read docstrings and shortened them, introduced the suggestion to use info: as a keyword which should for now be just appended to the docstring as usual but in the future should be treated as a comment, i.e. only meant for human contextualization but ignored for semantic interpretation of concepts, a key difference that I hope this will bring is to reduce also the length of base classes and appdef as they show up in html pages, specifically for appdefs like NXem many of the conceptual ideas which these docstrings currently contain would be much better placed in a proper documentation instead of the actual class definition in the hope that the overall appearance of classes becomes easier and faster for people to power read; maybe this also works against some criticism that NeXus is considered complex, I have to say with the outsourcing of NXcg_primitive_set I feel it is damn simple now * Refactoring of NXcs base classes * First lot of refactoring EM base classes, the rest tomorrow, NXapm will not be refactored before the APT&M2023 conference in Sept2023, also because feedback from Leoben was positive enough that no immediate changes wrt to appdefs and base classes were required * Summarize the current state of the discussion about coordinate systems with the proposed NXcoordinate_system and NXcoordinate_system_set base classes and best practice recommendations how they should be used including feedback from discussions with Florian Dobner and Tamás Haraszti * Summary of the discussion how to handle conventions and method-specific conventions for EM and methods used in EM * Base classes for implemented examples for pole figures, orientation distribution function, event_data, stage_lab, and ebsd_crystal_structure_model * NXms_ipf base class and dos2unix to correct newlines * Introducing NXem_method base class as a template how to write method-specific deep base classes to describe the terms and taxononmy of method-specific branches to be hooked into appdefs like NXem * Base class inheritance proposal for a now even stronger modularized schema set for electron microscopy research, two tasks remain: i) refactor what is now a method-specific instance rather than an appdef (NXem_ebsd) (mainly to be able to fuse all examples of em-specific data converters including new ebsd examples into one em parser for pynxtools), ii) refactor NXem which is now clearly a specific appdef specializing the NXem_base deep base class, specialization work needs to define which fields and groups from all the possible ones now composable via base classes (inheritance) are required in an appdef NXem for NOMAD OASIS * NXem_ebsd refactored into a base class to use it as a method-specific group inside the NXem application definition, next step: i) refactor NXem_sim, ii) finalize refactoring of NXem appdef (for Nomad oasis) * finished draft of NXem_ebsd, NXem_correlation, and NXem appdef, cleaning the branch * Add proposal for storing mtx cfg, fixed nxtime datatypes * 2d microstructure projection * Inspection how proposed, info, N0, N, R, Z value type abbreviations, and dimensions could be added to nyamlforward * A likely too simplistic but at least working nyaml2nxdl forward mapping to explore further usage of refactored EM base classes. Info keyword has to be a child of doc or the respective text be removed from the standard and put into proposal-specific documentation, how to store what and where so that the schema docstring remain succinct and slim but all these conceptual ideas get not forgotten, typically the would be part of a tech report, i.e. in my opinion all what is under info: sections of a docstring should move to some documentation to tell the story to humans, next test these NXDLs with the NeXus documentation system * Minor fix to handle info keyword spotted while compiling the documentation * Fixes to compile with NeXus documentation test suite and sphinx * Deactivated the annoying clean yaml via make clean for dev purposes * Minor fix in em_base, this completes the appdef/base class work for now on the refactored EM, there are still some spurious info fields now, which should be removed when a decision has been made wrt to how to deal with info: keyword fields in general, next steps: i) make decision on info, ii) test refactored EM proposal with pynxtools em-parser v2, iii) implement backwards * Styling via black * Added yaml2nxdl-forward-converted NXDL files to all refactored base classes and the refactored NXem * Added NXroot header for the em appdef and its base template appdef * Continuing the refactoring of EM and APM plus related base classes for CG and MS based on suggestions from user meetings, discussions with Sandor, represents work with the MPES sprint #83 * Continuing on #83 * Continuing #83, NXcs_* * Continuing #83, ipf, pf, odf * Continuing on #83, support classes for EM * Continued on #83, coordinate system, further base classes supporting EM * Continuing #83, event_data_set and event_data description substantially condensed amongst other points * Added cross-references to base classes for rst, continuing #83 * Aligned old NXem_ebsd_conventions with NXcoordinate_system for #83 * Reviewed method-specific base classes, ebsd, eds, eels, #83 * #83, NXms_recon * #83, composed constraints on the NXem appdef * Consolidated with changes that happened in between on the fairmat branch based on 1016aa0, NXms_recon has still an issue and is therefore deactivated currently, method-specific landing pages need to be updated * Consolidated further with fairmat 15624c0 * Fixing some missing references * Fixed syntax error to compile NXms_recon, docs building also now, reviewing intro pages remains * Consistencies of dimensionality to use NX_POSINT and an enumeration * Recompiled NXDL files using new nyaml module 3d500ced7e4ca57683957c1d61a8d0cb62eccf53, removed, modified by taking the one from fairmat, and synced all files which were binarily different between this feature branch and the fairmat branch specifically commit a15798b of the fairmat branch * Deactivated em-based tests which because of a refactoring of em are not expected to work anymore * Fix improper Latex notation in math environment for polyline, face_list, nanochem * Added recompiled NXidentifier, NXserialized NXDLs which triggered pipeline errors in CatChen gh action * Some round of proof-reading * Fixed test_nxdl_utils to reflect and use refactored locations of refactored NXem * Added feedback from @phyy-nx, @PeterC-DLS, and @prjemian from discussed here https://github.com/nexusformat/definitions PR nexusformat#1271 * Black formatting * Reactivated data type check for e.g. NXem NX_NUMBER * Implementing NX_DATE_TIME suggestion of @sanbrock --------- Co-authored-by: markus.kuehbach <[email protected]> # Conflicts: # applications/NXapm.nxdl.xml # applications/NXem.nxdl.xml # base_classes/NXaberration.nxdl.xml # base_classes/NXcg_alpha_complex.nxdl.xml # base_classes/NXcg_cylinder_set.nxdl.xml # base_classes/NXcg_geodesic_mesh.nxdl.xml # base_classes/NXcg_grid.nxdl.xml # base_classes/NXcg_half_edge_data_structure.nxdl.xml # base_classes/NXcg_marching_cubes.nxdl.xml # base_classes/NXcg_polyline_set.nxdl.xml # base_classes/NXcg_triangulated_surface_mesh.nxdl.xml # base_classes/NXcg_unit_normal_set.nxdl.xml # base_classes/NXchamber.nxdl.xml # base_classes/NXcoordinate_system_set.nxdl.xml # base_classes/NXcorrector_cs.nxdl.xml # base_classes/NXcs_computer.nxdl.xml # base_classes/NXcs_filter_boolean_mask.nxdl.xml # base_classes/NXcs_prng.nxdl.xml # base_classes/NXcs_profiling.nxdl.xml # base_classes/NXcs_profiling_event.nxdl.xml # base_classes/NXdeflector.nxdl.xml # base_classes/NXebeam_column.nxdl.xml # base_classes/NXem_ebsd.nxdl.xml # base_classes/NXevent_data_em.nxdl.xml # base_classes/NXevent_data_em_set.nxdl.xml # base_classes/NXibeam_column.nxdl.xml # base_classes/NXimage_set.nxdl.xml # base_classes/NXion.nxdl.xml # base_classes/NXlens_em.nxdl.xml # base_classes/NXoptical_system_em.nxdl.xml # base_classes/NXpump.nxdl.xml # base_classes/NXregistration.nxdl.xml # base_classes/NXscanbox_em.nxdl.xml # base_classes/NXspectrum_set.nxdl.xml # base_classes/NXstage_lab.nxdl.xml # contributed_definitions/NXaberration_model.nxdl.xml # contributed_definitions/NXaberration_model_ceos.nxdl.xml # contributed_definitions/NXaberration_model_nion.nxdl.xml # contributed_definitions/NXaperture_em.nxdl.xml # contributed_definitions/NXapm_paraprobe_results_nanochem.nxdl.xml # contributed_definitions/NXcg_ellipsoid_set.nxdl.xml # contributed_definitions/NXcg_face_list_data_structure.nxdl.xml # contributed_definitions/NXcg_hexahedron_set.nxdl.xml # contributed_definitions/NXcg_parallelogram_set.nxdl.xml # contributed_definitions/NXcg_point_set.nxdl.xml # contributed_definitions/NXcg_polygon_set.nxdl.xml # contributed_definitions/NXcg_polyhedron_set.nxdl.xml # contributed_definitions/NXcg_sphere_set.nxdl.xml # contributed_definitions/NXcg_tetrahedron_set.nxdl.xml # contributed_definitions/NXcg_triangle_set.nxdl.xml # contributed_definitions/NXcs_gpu_obj.nxdl.xml # contributed_definitions/NXcs_io_obj.nxdl.xml # contributed_definitions/NXcs_io_sys.nxdl.xml # contributed_definitions/NXcs_mm_sys.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_ebsd_crystal_structure_model.nxdl.xml # contributed_definitions/NXgraph_edge_set.nxdl.xml # contributed_definitions/NXgraph_node_set.nxdl.xml # contributed_definitions/NXgraph_root.nxdl.xml # contributed_definitions/NXimage_set_em_adf.nxdl.xml # contributed_definitions/NXimage_set_em_kikuchi.nxdl.xml # contributed_definitions/NXinteraction_vol_em.nxdl.xml # contributed_definitions/NXisocontour.nxdl.xml # contributed_definitions/NXms.nxdl.xml # contributed_definitions/NXms_feature_set.nxdl.xml # contributed_definitions/NXms_score_results.nxdl.xml # contributed_definitions/NXorientation_set.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXspectrum_set_em_eels.nxdl.xml # contributed_definitions/NXspectrum_set_em_xray.nxdl.xml # contributed_definitions/nyaml/NXaberration.yaml # contributed_definitions/nyaml/NXaberration_model.yaml # contributed_definitions/nyaml/NXaberration_model_ceos.yaml # contributed_definitions/nyaml/NXaberration_model_nion.yaml # contributed_definitions/nyaml/NXaperture_em.yaml # contributed_definitions/nyaml/NXapm.yaml # contributed_definitions/nyaml/NXapm_paraprobe_results_nanochem.yaml # contributed_definitions/nyaml/NXcg_alpha_complex.yaml # contributed_definitions/nyaml/NXcg_cylinder_set.yaml # contributed_definitions/nyaml/NXcg_ellipsoid_set.yaml # contributed_definitions/nyaml/NXcg_face_list_data_structure.yaml # contributed_definitions/nyaml/NXcg_geodesic_mesh.yaml # contributed_definitions/nyaml/NXcg_grid.yaml # contributed_definitions/nyaml/NXcg_half_edge_data_structure.yaml # contributed_definitions/nyaml/NXcg_hexahedron_set.yaml # contributed_definitions/nyaml/NXcg_marching_cubes.yaml # contributed_definitions/nyaml/NXcg_parallelogram_set.yaml # contributed_definitions/nyaml/NXcg_point_set.yaml # contributed_definitions/nyaml/NXcg_polygon_set.yaml # contributed_definitions/nyaml/NXcg_polyhedron_set.yaml # contributed_definitions/nyaml/NXcg_polyline_set.yaml # contributed_definitions/nyaml/NXcg_roi_set.yaml # contributed_definitions/nyaml/NXcg_sphere_set.yaml # contributed_definitions/nyaml/NXcg_tetrahedron_set.yaml # contributed_definitions/nyaml/NXcg_triangle_set.yaml # contributed_definitions/nyaml/NXcg_triangulated_surface_mesh.yaml # contributed_definitions/nyaml/NXcg_unit_normal_set.yaml # contributed_definitions/nyaml/NXchamber.yaml # contributed_definitions/nyaml/NXcoordinate_system_set.yaml # contributed_definitions/nyaml/NXcorrector_cs.yaml # contributed_definitions/nyaml/NXcs_computer.yaml # contributed_definitions/nyaml/NXcs_filter_boolean_mask.yaml # contributed_definitions/nyaml/NXcs_io_obj.yaml # contributed_definitions/nyaml/NXcs_io_sys.yaml # contributed_definitions/nyaml/NXcs_mm_sys.yaml # contributed_definitions/nyaml/NXcs_prng.yaml # contributed_definitions/nyaml/NXcs_profiling.yaml # contributed_definitions/nyaml/NXcs_profiling_event.yaml # contributed_definitions/nyaml/NXdeflector.yaml # contributed_definitions/nyaml/NXebeam_column.yaml # contributed_definitions/nyaml/NXem.yaml # contributed_definitions/nyaml/NXem_ebsd.yaml # contributed_definitions/nyaml/NXevent_data_em.yaml # contributed_definitions/nyaml/NXevent_data_em_set.yaml # contributed_definitions/nyaml/NXfabrication.yaml # contributed_definitions/nyaml/NXgraph_edge_set.yaml # contributed_definitions/nyaml/NXgraph_node_set.yaml # contributed_definitions/nyaml/NXgraph_root.yaml # contributed_definitions/nyaml/NXibeam_column.yaml # contributed_definitions/nyaml/NXimage_set.yaml # contributed_definitions/nyaml/NXinteraction_vol_em.yaml # contributed_definitions/nyaml/NXion.yaml # contributed_definitions/nyaml/NXisocontour.yaml # contributed_definitions/nyaml/NXlens_em.yaml # contributed_definitions/nyaml/NXms.yaml # contributed_definitions/nyaml/NXms_feature_set.yaml # contributed_definitions/nyaml/NXms_score_results.yaml # contributed_definitions/nyaml/NXoptical_system_em.yaml # contributed_definitions/nyaml/NXpump.yaml # contributed_definitions/nyaml/NXrotation_set.yaml # contributed_definitions/nyaml/NXscanbox_em.yaml # contributed_definitions/nyaml/NXspectrum_set.yaml # contributed_definitions/nyaml/NXstage_lab.yaml # dev_tools/tests/test_nxdl_utils.py # manual/source/classes/contributed_definitions/cgms-structure.rst # manual/source/classes/contributed_definitions/em-structure.rst # manual/source/classes/contributed_definitions/icme-structure.rst
# Conflicts: # base_classes/NXcg_roi_set.nxdl.xml # base_classes/NXcollectioncolumn.nxdl.xml # base_classes/NXem_img.nxdl.xml # base_classes/NXem_method.nxdl.xml # base_classes/NXprogram.nxdl.xml # base_classes/NXroi.nxdl.xml # base_classes/NXroot.nxdl.xml # contributed_definitions/NXaberration.nxdl.xml # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXcalibration.nxdl.xml # contributed_definitions/NXcoordinate_system_set.nxdl.xml # contributed_definitions/NXcorrector_cs.nxdl.xml # contributed_definitions/NXcs_computer.nxdl.xml # contributed_definitions/NXcs_filter_boolean_mask.nxdl.xml # contributed_definitions/NXcs_prng.nxdl.xml # contributed_definitions/NXcs_profiling.nxdl.xml # contributed_definitions/NXcs_profiling_event.nxdl.xml # contributed_definitions/NXdeflector.nxdl.xml # contributed_definitions/NXebeam_column.nxdl.xml # contributed_definitions/NXelectronanalyser.nxdl.xml # contributed_definitions/NXem.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_ebsd.nxdl.xml # contributed_definitions/NXenergydispersion.nxdl.xml # contributed_definitions/NXevent_data_em.nxdl.xml # contributed_definitions/NXevent_data_em_set.nxdl.xml # contributed_definitions/NXibeam_column.nxdl.xml # contributed_definitions/NXidentifier.nxdl.xml # contributed_definitions/NXinteraction_vol_em.nxdl.xml # contributed_definitions/NXion.nxdl.xml # contributed_definitions/NXlens_em.nxdl.xml # contributed_definitions/NXmpes.nxdl.xml # contributed_definitions/NXoptical_system_em.nxdl.xml # contributed_definitions/NXpump.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXscanbox_em.nxdl.xml # contributed_definitions/NXserialized.nxdl.xml # contributed_definitions/NXspectrum_set.nxdl.xml # contributed_definitions/NXstage_lab.nxdl.xml # contributed_definitions/NXxrd.nxdl.xml # contributed_definitions/NXxrd_pan.nxdl.xml
# Conflicts: # base_classes/NXroot.nxdl.xml # contributed_definitions/NXchamber.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXfabrication.nxdl.xml # contributed_definitions/NXidentifier.nxdl.xml # contributed_definitions/NXimage_set.nxdl.xml # contributed_definitions/NXinteraction_vol_em.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXserialized.nxdl.xml # contributed_definitions/NXxrd.nxdl.xml # contributed_definitions/NXxrd_pan.nxdl.xml
…s 0572bfa9df6f513325024185ed1f1c1901d0758c # Conflicts: # base_classes/NXpeak.nxdl.xml # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXapm_paraprobe_ranger_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tool_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_transcoder_results.nxdl.xml # contributed_definitions/NXapm_sim.nxdl.xml # contributed_definitions/NXchamber.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXfabrication.nxdl.xml # contributed_definitions/NXidentifier.nxdl.xml # contributed_definitions/NXimage_set.nxdl.xml # contributed_definitions/NXinteraction_vol_em.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXserialized.nxdl.xml # contributed_definitions/NXxrd.nxdl.xml # contributed_definitions/NXxrd_pan.nxdl.xml # contributed_definitions/nyaml/NXapm.yaml # contributed_definitions/nyaml/NXapm_charge_state_analysis.yaml # contributed_definitions/nyaml/NXapm_hit_finding.yaml # contributed_definitions/nyaml/NXapm_ranging.yaml # contributed_definitions/nyaml/NXapm_reconstruction.yaml # contributed_definitions/nyaml/NXapm_volt_and_bowl.yaml # contributed_definitions/nyaml/NXevent_data_apm.yaml # contributed_definitions/nyaml/NXpeak.yaml
# Conflicts: # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXapm_paraprobe_clusterer_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_clusterer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_distancer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_intersector_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_intersector_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_nanochem_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_nanochem_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_ranger_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_selector_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_spatstat_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_spatstat_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_surfacer_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_surfacer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tessellator_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tool_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_transcoder_results.nxdl.xml # contributed_definitions/NXcg_face_list_data_structure.nxdl.xml # contributed_definitions/NXcg_hexahedron_set.nxdl.xml # contributed_definitions/NXcg_parallelogram_set.nxdl.xml # contributed_definitions/NXcg_point_set.nxdl.xml # contributed_definitions/NXcorrector_cs.nxdl.xml # contributed_definitions/NXdelocalization.nxdl.xml # contributed_definitions/NXem_base.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_ebsd.nxdl.xml # contributed_definitions/NXem_eds.nxdl.xml # contributed_definitions/NXgraph_edge_set.nxdl.xml # contributed_definitions/NXimage_c_set.nxdl.xml # contributed_definitions/NXimage_r_set.nxdl.xml # contributed_definitions/NXion.nxdl.xml # contributed_definitions/NXms_feature_set.nxdl.xml # contributed_definitions/NXoptical_system_em.nxdl.xml # contributed_definitions/NXpeak.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXspectrum_set.nxdl.xml
# Conflicts: # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXcg_ellipsoid_set.nxdl.xml # contributed_definitions/NXcg_face_list_data_structure.nxdl.xml # contributed_definitions/NXcg_hexahedron_set.nxdl.xml # contributed_definitions/NXcg_parallelogram_set.nxdl.xml # contributed_definitions/NXcg_point_set.nxdl.xml # contributed_definitions/NXcg_polyhedron_set.nxdl.xml # contributed_definitions/NXcg_sphere_set.nxdl.xml # contributed_definitions/NXchamber.nxdl.xml # contributed_definitions/NXcorrector_cs.nxdl.xml # contributed_definitions/NXem.nxdl.xml # contributed_definitions/NXem_base.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_ebsd.nxdl.xml # contributed_definitions/NXem_eds.nxdl.xml # contributed_definitions/NXfabrication.nxdl.xml # contributed_definitions/NXgraph_edge_set.nxdl.xml # contributed_definitions/NXidentifier.nxdl.xml # contributed_definitions/NXimage_c_set.nxdl.xml # contributed_definitions/NXimage_r_set.nxdl.xml # contributed_definitions/NXimage_set.nxdl.xml # contributed_definitions/NXinteraction_vol_em.nxdl.xml # contributed_definitions/NXion.nxdl.xml # contributed_definitions/NXms_feature_set.nxdl.xml # contributed_definitions/NXoptical_system_em.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXscanbox_em.nxdl.xml # contributed_definitions/NXserialized.nxdl.xml # contributed_definitions/NXspectrum_set.nxdl.xml # contributed_definitions/NXxrd.nxdl.xml # contributed_definitions/NXxrd_pan.nxdl.xml # contributed_definitions/nyaml/NXem.yaml # contributed_definitions/nyaml/NXem_base.yaml
# Conflicts: # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXapm_paraprobe_clusterer_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_clusterer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_distancer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_intersector_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_intersector_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_nanochem_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_nanochem_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_ranger_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_selector_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_spatstat_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_spatstat_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_surfacer_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_surfacer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tessellator_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tool_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_transcoder_results.nxdl.xml # contributed_definitions/NXcg_face_list_data_structure.nxdl.xml # contributed_definitions/NXcg_hexahedron_set.nxdl.xml # contributed_definitions/NXcg_parallelogram_set.nxdl.xml # contributed_definitions/NXcg_point_set.nxdl.xml # contributed_definitions/NXcg_sphere_set.nxdl.xml # contributed_definitions/NXcorrector_cs.nxdl.xml # contributed_definitions/NXdelocalization.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_ebsd.nxdl.xml # contributed_definitions/NXem_eds.nxdl.xml # contributed_definitions/NXgraph_edge_set.nxdl.xml # contributed_definitions/NXimage_c_set.nxdl.xml # contributed_definitions/NXimage_r_set.nxdl.xml # contributed_definitions/NXion.nxdl.xml # contributed_definitions/NXms_feature_set.nxdl.xml # contributed_definitions/NXoptical_system_em.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXscanbox_em.nxdl.xml # contributed_definitions/NXspectrum_set.nxdl.xml
* Pin nyaml==0.0.8 * Regenerate nxdls # Conflicts: # contributed_definitions/NXapm.nxdl.xml # contributed_definitions/NXapm_paraprobe_clusterer_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_clusterer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_distancer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_intersector_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_intersector_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_nanochem_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_nanochem_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_ranger_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_selector_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_spatstat_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_spatstat_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_surfacer_config.nxdl.xml # contributed_definitions/NXapm_paraprobe_surfacer_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tessellator_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_tool_results.nxdl.xml # contributed_definitions/NXapm_paraprobe_transcoder_results.nxdl.xml # contributed_definitions/NXcg_face_list_data_structure.nxdl.xml # contributed_definitions/NXcg_hexahedron_set.nxdl.xml # contributed_definitions/NXcg_parallelogram_set.nxdl.xml # contributed_definitions/NXcg_point_set.nxdl.xml # contributed_definitions/NXcg_sphere_set.nxdl.xml # contributed_definitions/NXcorrector_cs.nxdl.xml # contributed_definitions/NXdelocalization.nxdl.xml # contributed_definitions/NXem_conventions.nxdl.xml # contributed_definitions/NXem_ebsd.nxdl.xml # contributed_definitions/NXem_eds.nxdl.xml # contributed_definitions/NXgraph_edge_set.nxdl.xml # contributed_definitions/NXimage_c_set.nxdl.xml # contributed_definitions/NXimage_r_set.nxdl.xml # contributed_definitions/NXion.nxdl.xml # contributed_definitions/NXms_feature_set.nxdl.xml # contributed_definitions/NXoptical_system_em.nxdl.xml # contributed_definitions/NXrotation_set.nxdl.xml # contributed_definitions/NXscanbox_em.nxdl.xml # contributed_definitions/NXspectrum_set.nxdl.xml # contributed_definitions/NXstage_lab.nxdl.xml
# 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/NXdata_mpes.nxdl.xml # base_classes/NXdata_mpes_detector.nxdl.xml # base_classes/NXelectron_level.nxdl.xml # base_classes/NXem_eds.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/NXphysical_process.nxdl.xml # base_classes/NXprocess_mpes.nxdl.xml # base_classes/NXprogram.nxdl.xml # base_classes/NXregistration.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/NXadc.nxdl.xml # contributed_definitions/NXaperture_em.nxdl.xml # contributed_definitions/NXapm_sim.nxdl.xml # contributed_definitions/NXcs_cpu_obj.nxdl.xml # contributed_definitions/NXcs_cpu_sys.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/NXms_snapshot.nxdl.xml # contributed_definitions/NXprogram.nxdl.xml # contributed_definitions/NXregistration.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
lukaspie
force-pushed
the
fairmat-2024-computational-geometry
branch
from
624f780
to
9e6e54f
Compare
lukaspie
force-pushed
the
fairmat-2024-computational-geometry
branch
from
93bf181
to
3585a55
Compare
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.