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

Fairmat 2024: new common base classes #1426

Open
wants to merge 1,154 commits into
base: main
Choose a base branch
from
Open

Fairmat 2024: new common base classes #1426

wants to merge 1,154 commits into from

Conversation

lukaspie
Copy link
Contributor

@lukaspie lukaspie commented Sep 24, 2024 •
edited
Loading

These introduces new base classes that are needed for more than one of these other PRs:
#1422
#1423
#1424
#1425

Bundling for easier review.

atomprobe-tc and others added 30 commits July 4, 2024 13:04
@atomprobe-tc
Merge branch 'fairmat' into sprint22_matwerk
bd1ba65
@mkuehbach
Merge pull request #258 from FAIRmat-NFDI/sprint22_matwerk
138f40b 
Sprint22 matwerk #248
@atomprobe-tc
Merge branch 'fairmat' into sprint22_clear_duplicates_for_circuits
2d65b0f
@atomprobe-tc
Refactoring of base class umbrella for description of a computer base…
8633744 
…d on feedback from @RubelMozumder, @lukaspie, as well as @sanbrock
@atomprobe-tc
Final minor fixes
232cc40
@atomprobe-tc
done
fa24bbf
@lukaspie
fix mpes-structure.rst
2f06550
@lukaspie
Merge pull request #249 from FAIRmat-NFDI/246-finalize-nxxps
17399f1 
Application definition for XPS
@mkuehbach
Merge pull request #260 from FAIRmat-NFDI/sprint22_clear_duplicates_f…
28c3726 
…or_circuits

Cleaned the too many base classes for circuits and cleaned base classes for describing a computer
Merge branch 'fairmat' into sprint22_corrector
71ea669
Remove previous deleted file
fe64f3d
@lukaspie
make geometries and source recommended in xps
0e96bf4
@lukaspie
Merge pull request #264 from FAIRmat-NFDI/small-xps-fixes
9e8dc2f 
Make geometries and sourceTYPE recommended in NXxps
@lukaspie
change docs in NXcollectioncolumn
1ff2e2e
@lukaspie
regenerate nxdl files
2f8dbdd
@lukaspie
Merge pull request #265 from FAIRmat-NFDI/docs-in-nxcollectioncolumn
26d4faa 
change docs in NXcollectioncolumn
@lukaspie
small modifications to clarify NXmpes
8cd2d5c
@atomprobe-tc
Base class refactoring for NXms proposal removing too small base clas…
b45e417 
…ses by definitions in appdefs
@atomprobe-tc
Following @lukaspie suggestion to rename the base classes related to …
ddfbd01 
…NXms with NXmicrostructure to avoid confusing the symbol convention with mass spectrometry as the abbreviation NXms may suggest
@lukaspie
remove changes to polarization in NXbeam
a56552b
@lukaspie
remove changes to final_polarization in NXbeam
4456194
@atomprobe-tc
Removed remaining references to NXms and renamed NXslip_system_set
87bd254
@atomprobe-tc
Removed the two tiny base classes NXmicrostructure_snapshot and *_set
0beac13
@atomprobe-tc
Refactored NXmicrostructure_feature_set to map to NXmicrostructure_re…
171e23a 
…con and eventually make this NXmicrostructure
@atomprobe-tc
Removed NXmicrostructure_recon
612c550
@atomprobe-tc
Fix documentation generation
f88f38d
@atomprobe-tc
Continuing on NXmicrostructure
9b23f4e
@atomprobe-tc
Finished NXmicrostructure
e92255b
@lukaspie
Fix docs CI to only keep orphan branch
78ddc2a
@atomprobe-tc
Finalized data model for NXmicrostructure_imm
d1442c3
lukaspie and others added 21 commits September 18, 2024 17:14
@lukaspie
Merge pull request #293 from FAIRmat-NFDI/add-ccs-tweak-to-hide-summary
08c4fcb 
Add CSS tweak to hide summary
@atomprobe-tc
Suggestions from Lukas
09aa519
@lukaspie
fix dev_tools tests
139d664 
black code style
@lukaspie
remove use of details_summary_hide
4abdc46
@lukaspie
change refs in NXarpes
d20af52
@lukaspie
move doc bundles to applications and base_classes
101a093
@lukaspie
Merge commit '09aa5191d2e327d74f54e20aac091c94661b90fe' into fairmat-…
4f52a8a 
…2024
@atomprobe-tc
Reverting the proposal that NXmicrostructure is not just proposed for…
5ac17fb 
… contributed but implicitly as a dependency of NXem, NXem_ebsd, NXem_img proposed for voting and acceptance
@lukaspie
Merge commit '5ac17fba2c96b83b3aa40446ba3f57b877be93bf' into fairmat-…
e430164 
…2024
@atomprobe-tc
Revert one more microstructure
4e485a6
@lukaspie
Merge commit '4e485a6cb4b185da158439b6e6c726e628eb1740' into fairmat-…
2b6e1c3 
…2024
@lukaspie
move new definitions to application and base_classes
81d927c
@lukaspie
small update to mpes-structure
4bbc850
@RubelMozumder
update category for NXxrd.nxdl. (#296)
69bc9dc
@lukaspie
remove fairmat-specific files
0200cd6
@lukaspie
remove nyaml files
00645ff
@lukaspie
move NXdata_mpes* classes back to contributed
2287569
@lukaspie
revert small changes to the dev_tools
1544232 
black formatting

isort dev_tools
@lukaspie
change docs in NXcircuit
105029a
@lukaspie
pull out modifications for fairmat-2024-common-base-classes
fd34a75
@lukaspie
remove classes from contributed that have been moved to base_classes
f61f3fd
@lukaspie lukaspie marked this pull request as ready for review September 24, 2024 10:59
@prjemian
Copy link
Contributor

Any new classes, whether intended to be a base class or an application definition, must go into contributed definitions until they are ratified by the NIAC.

@lukaspie lukaspie mentioned this pull request Sep 24, 2024
Draft
prjemian
prjemian requested changes Sep 24, 2024
View reviewed changes
Copy link
Contributor

@prjemian prjemian left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any new classes must be add to contributed_definitions/, not directly to base_classes/ or application_definnitions/.

@sanbrock sanbrock mentioned this pull request Sep 29, 2024
Open
@lukaspie lukaspie linked an issue Sep 29, 2024 that may be closed by this pull request
new common base classes #1467
Open
This was referenced Sep 29, 2024
Open
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@prjemian prjemian prjemian requested changes

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

new common base classes
8 participants
@lukaspie @prjemian @atomprobe-tc @mkuehbach @domna @RubelMozumder @RonHildebrandt @rettigl