-
Notifications
You must be signed in to change notification settings - Fork 5
Transmission modify sample #167
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.
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
Merged
ka-sarthak
merged 37 commits into
transmission-new-version
from
transmission-modify-sample
Sep 10, 2024
Merged
Transmission modify sample #167
ka-sarthak
merged 37 commits into
transmission-new-version
from
transmission-modify-sample
Sep 10, 2024
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
e3fdf66 to
c2c3727
Compare
2ffd519 to
ad38e07
Compare
28139b5 to
d2789b7
Compare
d2789b7 to
fc3b634
Compare
… physical props; refactor normalize
0bf5cb9 to
0d3dba3
Compare
…to atomic fraction
4b6a549 to
7ec62c5
Compare
4b6a549 to
7879efb
Compare
7ec62c5 to
4b6a549
Compare
ka-sarthak
added a commit
that referenced
this pull request
Oct 2, 2024
* Order quantities; revert modification of basesection quantities * Modify description of quantities * Populate elements and components based on chemical_composition * Add overwrite_quantity in merge_sections * Include merge section capability to allow GUI interaction in `components` * Restrict component class to `PureSubstanceComponent` * Move material system as sub-section in TransmissionSample * Add module for material_system and classes for Solid Solution * Create TransmissionSampleReference class and use it in samples subsection * Make SolidSolution as an entry class; reference it in TransmissionSample * Bugfix: logic of adjusting composition * Rearrange imports * Add physical properties classes * Refactor Transmission sample to be a section containing reference and physical props; refactor normalize * Fixing rebase * Changing warn to warning * Move Physical properties to schema * Rename section names; add docstring for naming convention * Add crystal, polycrystal, mixed crystal, mixed polycrystal sections * Ruff * Add material system entry point; rename dopant as impurity * Refine the ELN properties of sample related schemas * Refine ELN properties for material system; make atomic percentage in to atomic fraction * Remove materials_system: they will be moved to nomad-material-processing * Align TransmissionSampleReference with CompositeSystemReference * Compose a Sample class based on composite system * Refactor extinction coefficient calc and plot * Temporary bugfix for extinction coeff calc; minor changes in schema * Update nomad * Bugfix schema import; ignore search when in client context * Add caplog conftest * Bugfix: updating schema in search_quantities * Add aliases * Add previous archives to test for backward compatibility * Add test for backward compatibility * Add fixes for backward compatibility * Move RawFileTransmissionData to schema
ka-sarthak
added a commit
that referenced
this pull request
Oct 10, 2024
* Order quantities; revert modification of basesection quantities * Modify description of quantities * Populate elements and components based on chemical_composition * Add overwrite_quantity in merge_sections * Include merge section capability to allow GUI interaction in `components` * Restrict component class to `PureSubstanceComponent` * Move material system as sub-section in TransmissionSample * Add module for material_system and classes for Solid Solution * Create TransmissionSampleReference class and use it in samples subsection * Make SolidSolution as an entry class; reference it in TransmissionSample * Bugfix: logic of adjusting composition * Rearrange imports * Add physical properties classes * Refactor Transmission sample to be a section containing reference and physical props; refactor normalize * Fixing rebase * Changing warn to warning * Move Physical properties to schema * Rename section names; add docstring for naming convention * Add crystal, polycrystal, mixed crystal, mixed polycrystal sections * Ruff * Add material system entry point; rename dopant as impurity * Refine the ELN properties of sample related schemas * Refine ELN properties for material system; make atomic percentage in to atomic fraction * Remove materials_system: they will be moved to nomad-material-processing * Align TransmissionSampleReference with CompositeSystemReference * Compose a Sample class based on composite system * Refactor extinction coefficient calc and plot * Temporary bugfix for extinction coeff calc; minor changes in schema * Update nomad * Bugfix schema import; ignore search when in client context * Add caplog conftest * Bugfix: updating schema in search_quantities * Add aliases * Add previous archives to test for backward compatibility * Add test for backward compatibility * Add fixes for backward compatibility * Move RawFileTransmissionData to schema
ka-sarthak
added a commit
that referenced
this pull request
Oct 10, 2024
* Order quantities; revert modification of basesection quantities * Modify description of quantities * Populate elements and components based on chemical_composition * Add overwrite_quantity in merge_sections * Include merge section capability to allow GUI interaction in `components` * Restrict component class to `PureSubstanceComponent` * Move material system as sub-section in TransmissionSample * Add module for material_system and classes for Solid Solution * Create TransmissionSampleReference class and use it in samples subsection * Make SolidSolution as an entry class; reference it in TransmissionSample * Bugfix: logic of adjusting composition * Rearrange imports * Add physical properties classes * Refactor Transmission sample to be a section containing reference and physical props; refactor normalize * Fixing rebase * Changing warn to warning * Move Physical properties to schema * Rename section names; add docstring for naming convention * Add crystal, polycrystal, mixed crystal, mixed polycrystal sections * Ruff * Add material system entry point; rename dopant as impurity * Refine the ELN properties of sample related schemas * Refine ELN properties for material system; make atomic percentage in to atomic fraction * Remove materials_system: they will be moved to nomad-material-processing * Align TransmissionSampleReference with CompositeSystemReference * Compose a Sample class based on composite system * Refactor extinction coefficient calc and plot * Temporary bugfix for extinction coeff calc; minor changes in schema * Update nomad * Bugfix schema import; ignore search when in client context * Add caplog conftest * Bugfix: updating schema in search_quantities * Add aliases * Add previous archives to test for backward compatibility * Add test for backward compatibility * Add fixes for backward compatibility * Move RawFileTransmissionData to schema
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
breaking changes
Changes made with this PR will need manual effort to reconcile with the existing entries
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.
This brings the following changes in the schema
Refactors around sample
Sampleis a composite system containing information about the sample id, geometry, and reference to the material system undercomponentssub-section.TransmissionSampleReferenceis a composite system reference containing information related to the sample that is specific to the Transmission. It has a reference toSample, thickness or path length, and orientation of the sample with respect to the light beam. Path length can be taken from the sample geometry. Orientation is expected to be in miller indices.Adds the tests for backward compatibility
Moves
RawFileTransmissionDatato schema.pyRenames the classes for consistency
The material system classes, originally planned to be written here, will be handled in
nomad-material-processingFAIRmat-NFDI/nomad-material-processing#77.