Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

All terms in EMglossary into NXem, NXem v3 candidate #243

Open
10 of 13 tasks
mkuehbach opened this issue Jun 19, 2024 · 1 comment
Open
10 of 13 tasks

All terms in EMglossary into NXem, NXem v3 candidate #243

mkuehbach opened this issue Jun 19, 2024 · 1 comment
Assignees
@mkuehbach

Comments

@mkuehbach
Copy link
Collaborator

mkuehbach commented Jun 19, 2024 •
edited
Loading

  • Update pynxtools-em template pathes accordingly
@mkuehbach mkuehbach changed the title All terms in EMglossary into NXem All terms in EMglossary into NXem surplus NXcorrector_ast, NXcorrector_cc Jun 19, 2024
@mkuehbach mkuehbach self-assigned this Jun 19, 2024
mkuehbach pushed a commit that referenced this issue Jun 25, 2024
#243 adding correctors
3588716
mkuehbach pushed a commit that referenced this issue Jun 25, 2024
#243 add description field in NXevent_data_em pointing to information…
78a4761 
… source inside tech partner file
mkuehbach pushed a commit that referenced this issue Jun 27, 2024
@atomprobe-tc
Implemented suggestions from @lukaspie related to points mentioned in #…
5b79081 
…243
mkuehbach added a commit that referenced this issue Jun 27, 2024
@mkuehbach
Merge pull request #251 from FAIRmat-NFDI/sprint22_emglossary
3296e72 
#243 added connections to HMC EMglossary
@mkuehbach mkuehbach changed the title All terms in EMglossary into NXem surplus NXcorrector_ast, NXcorrector_cc All terms in EMglossary into NXem, NXem v2 + correctors Jul 4, 2024
@mkuehbach mkuehbach changed the title All terms in EMglossary into NXem, NXem v2 + correctors All terms in EMglossary into NXem, NXem v3 candidate Jul 4, 2024
@mkuehbach
Copy link
Collaborator Author

Implemented in prepared PR #250,
writing to fairmat is hold back though to avoid that the current pynxtools-em fails, this refactoring on pynxtools-em is next

lukaspie pushed a commit that referenced this issue Sep 24, 2024
@lukaspie
#243 adding correctors
da09ead 
# Conflicts:
#	contributed_definitions/NXaperture_em.nxdl.xml
#	contributed_definitions/NXcomponent_em.nxdl.xml
#	contributed_definitions/NXcorrector_cs.nxdl.xml
#	contributed_definitions/NXscanbox_em.nxdl.xml
#	contributed_definitions/nyaml/NXaperture_em.yaml
#	contributed_definitions/nyaml/NXcorrector_cs.yaml
#	contributed_definitions/nyaml/NXlens_em.yaml
#	contributed_definitions/nyaml/NXscanbox_em.yaml
lukaspie pushed a commit that referenced this issue Sep 24, 2024
@lukaspie
#243 add description field in NXevent_data_em pointing to information…
b494a29 
… source inside tech partner file

# Conflicts:
#	contributed_definitions/NXimage_set.nxdl.xml
#	contributed_definitions/NXspectrum_set.nxdl.xml
#	contributed_definitions/nyaml/NXimage_set.yaml
#	contributed_definitions/nyaml/NXspectrum_set.yaml
lukaspie pushed a commit that referenced this issue Sep 24, 2024
@lukaspie
#243 adding correctors
e0f4ed0 
# Conflicts:
#	base_classes/NXlens_em.nxdl.xml
#	contributed_definitions/NXaperture_em.nxdl.xml
#	contributed_definitions/NXcomponent_em.nxdl.xml
#	contributed_definitions/NXcorrector_cs.nxdl.xml
#	contributed_definitions/NXscanbox_em.nxdl.xml
#	contributed_definitions/nyaml/NXaperture_em.yaml
#	contributed_definitions/nyaml/NXcorrector_cs.yaml
#	contributed_definitions/nyaml/NXlens_em.yaml
#	contributed_definitions/nyaml/NXscanbox_em.yaml
lukaspie pushed a commit that referenced this issue Sep 24, 2024
@atomprobe-tc @lukaspie
Implemented suggestions from @lukaspie related to points mentioned in #…
b788bb8 
…243

# Conflicts:
#	base_classes/NXchemical_composition.nxdl.xml
#	base_classes/NXfabrication.nxdl.xml
#	base_classes/NXfit_parameter.nxdl.xml
#	contributed_definitions/NXcorrector_ax.nxdl.xml
#	contributed_definitions/NXcorrector_cc.nxdl.xml
#	contributed_definitions/NXcorrector_cs.nxdl.xml
#	contributed_definitions/NXebeam_column.nxdl.xml
#	contributed_definitions/NXem.nxdl.xml
#	contributed_definitions/NXibeam_column.nxdl.xml
#	contributed_definitions/nyaml/NXcorrector_ax.yaml
#	contributed_definitions/nyaml/NXcorrector_cs.yaml
#	contributed_definitions/nyaml/NXebeam_column.yaml
#	contributed_definitions/nyaml/NXem.yaml
#	contributed_definitions/nyaml/NXibeam_column.yaml
#	manual/source/classes/contributed_definitions/em-structure.rst
lukaspie pushed a commit that referenced this issue Sep 24, 2024
@atomprobe-tc @lukaspie
Implemented suggestions from @lukaspie related to points mentioned in #…
3e51197 
…243

# Conflicts:
#	contributed_definitions/NXcomponent_em.nxdl.xml
#	contributed_definitions/NXcorrector_cs.nxdl.xml
#	contributed_definitions/NXebeam_column.nxdl.xml
#	contributed_definitions/NXem.nxdl.xml
#	contributed_definitions/NXibeam_column.nxdl.xml
#	contributed_definitions/nyaml/NXcomponent_em.yaml
#	contributed_definitions/nyaml/NXcorrector_cs.yaml
#	contributed_definitions/nyaml/NXebeam_column.yaml
#	contributed_definitions/nyaml/NXem.yaml
#	contributed_definitions/nyaml/NXibeam_column.yaml
#	manual/source/classes/contributed_definitions/em-structure.rst
lukaspie pushed a commit that referenced this issue Oct 4, 2024
@atomprobe-tc @lukaspie
Implemented suggestions from @lukaspie related to points mentioned in #…
94fc4aa 
…243

# Conflicts:
#	contributed_definitions/NXcomponent_em.nxdl.xml
#	contributed_definitions/NXcorrector_cs.nxdl.xml
#	contributed_definitions/NXebeam_column.nxdl.xml
#	contributed_definitions/NXem.nxdl.xml
#	contributed_definitions/NXibeam_column.nxdl.xml
#	contributed_definitions/nyaml/NXcomponent_em.yaml
#	contributed_definitions/nyaml/NXcorrector_cs.yaml
#	contributed_definitions/nyaml/NXebeam_column.yaml
#	contributed_definitions/nyaml/NXem.yaml
#	contributed_definitions/nyaml/NXibeam_column.yaml
#	manual/source/classes/contributed_definitions/em-structure.rst
lukaspie pushed a commit that referenced this issue Oct 4, 2024
@atomprobe-tc @lukaspie
Implemented suggestions from @lukaspie related to points mentioned in #…
9a5bca3 
…243

# Conflicts:
#	contributed_definitions/NXcomponent_em.nxdl.xml
#	contributed_definitions/NXcorrector_cs.nxdl.xml
#	contributed_definitions/NXebeam_column.nxdl.xml
#	contributed_definitions/NXem.nxdl.xml
#	contributed_definitions/NXibeam_column.nxdl.xml
#	contributed_definitions/nyaml/NXcomponent_em.yaml
#	contributed_definitions/nyaml/NXcorrector_cs.yaml
#	contributed_definitions/nyaml/NXebeam_column.yaml
#	contributed_definitions/nyaml/NXem.yaml
#	contributed_definitions/nyaml/NXibeam_column.yaml
#	manual/source/classes/contributed_definitions/em-structure.rst
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@mkuehbach mkuehbach

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@mkuehbach