Skip to content

Commit 8de873b

Browse files
authored
Transmission modify sample (#167)
* 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
1 parent 7879efb commit 8de873b

17 files changed

+3290
-103
lines changed

transmission/transmission_plugin/uv_vis_nir_transmission_plugin/pyproject.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@ classifiers = [
1919
"License :: OSI Approved :: Apache Software License",
2020
]
2121
dependencies = [
22-
"nomad-lab>=1.2.2dev578",
22+
"nomad-lab>=1.3.4dev",
23+
"nomad-material-processing"
2324
]
2425
[project.optional-dependencies]
2526
dev = [
2627
"ruff",
2728
"pytest",
2829
"structlog",
30+
"nomad-lab[infrastructure]>=1.3.4dev",
2931
]
3032

3133
[project.license]

transmission/transmission_plugin/uv_vis_nir_transmission_plugin/src/transmission/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ def load(self):
4646
description='Schema for data from Transmission Spectrophotometry.',
4747
)
4848

49+
4950
parser = TransmissionParserEntryPoint(
5051
name='Transmission Parser',
5152
description='Parser for data from Transmission Spectrophotometry.',

transmission/transmission_plugin/uv_vis_nir_transmission_plugin/src/transmission/parser.py

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,9 @@
1717
#
1818
from typing import TYPE_CHECKING
1919

20-
from nomad.datamodel.data import (
21-
EntryData,
22-
)
23-
from nomad.datamodel.metainfo.annotations import (
24-
ELNAnnotation,
25-
)
26-
from nomad.metainfo import (
27-
Quantity,
28-
)
2920
from nomad.parsing import MatchingParser
3021

31-
from transmission.schema import ELNUVVisTransmission
22+
from transmission.schema import ELNUVVisNirTransmission, RawFileTransmissionData
3223
from transmission.utils import create_archive
3324

3425
if TYPE_CHECKING:
@@ -37,19 +28,6 @@
3728
)
3829

3930

40-
class RawFileTransmissionData(EntryData):
41-
"""
42-
Section for a Transmission Spectrophotometry data file.
43-
"""
44-
45-
measurement = Quantity(
46-
type=ELNUVVisTransmission,
47-
a_eln=ELNAnnotation(
48-
component='ReferenceEditQuantity',
49-
),
50-
)
51-
52-
5331
class TransmissionParser(MatchingParser):
5432
"""
5533
Parser for matching files from Transmission Spectrophotometry and
@@ -60,7 +38,9 @@ def parse(
6038
self, mainfile: str, archive: 'EntryArchive', logger=None, child_archives=None
6139
) -> None:
6240
data_file = mainfile.split('/')[-1]
63-
entry = ELNUVVisTransmission.m_from_dict(ELNUVVisTransmission.m_def.a_template)
41+
entry = ELNUVVisNirTransmission.m_from_dict(
42+
ELNUVVisNirTransmission.m_def.a_template
43+
)
6444
entry.data_file = data_file
6545
file_name = f'{".".join(data_file.split(".")[:-1])}.archive.json'
6646
archive.data = RawFileTransmissionData(

0 commit comments

Comments
 (0)