Skip to content

Commit 7ec62c5

Browse files
committed
Move RawFileTransmissionData to schema
1 parent c872299 commit 7ec62c5

File tree

3 files changed

+17
-23
lines changed

3 files changed

+17
-23
lines changed

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

Lines changed: 1 addition & 23 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 ELNUVVisNirTransmission
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=ELNUVVisNirTransmission,
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

transmission/transmission_plugin/uv_vis_nir_transmission_plugin/src/transmission/schema.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
aliases=[
8585
'uv_vis_nir_transmission',
8686
'uv_vis_nir_transmission.schema',
87+
'uv_vis_nir_transmission.parser',
8788
],
8889
)
8990

@@ -1189,6 +1190,19 @@ def normalize(self, archive: 'EntryArchive', logger: 'BoundLogger'):
11891190
self.figures = self.results[0].generate_plots()
11901191

11911192

1193+
class RawFileTransmissionData(EntryData):
1194+
"""
1195+
Section for a Transmission Spectrophotometry data file.
1196+
"""
1197+
1198+
measurement = Quantity(
1199+
type=ELNUVVisNirTransmission,
1200+
a_eln=ELNAnnotation(
1201+
component='ReferenceEditQuantity',
1202+
),
1203+
)
1204+
1205+
11921206
ELNUVVisTransmission = ELNUVVisNirTransmission
11931207
TransmissionSample = Sample
11941208

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
data:
2+
m_def: uv_vis_nir_transmission.parser.RawFileTransmissionData

0 commit comments

Comments
 (0)