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.

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

SampleHolder small changes #117

Merged
merged 2 commits into from
Oct 31, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 24 additions & 10 deletions src/nomad_material_processing/vapor_deposition/general.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
Component,
CompositeSystemReference,
Entity,
EntityReference,
PubChemPureSubstanceSection,
PureSubstanceSection,
)
Expand Down Expand Up @@ -118,6 +119,21 @@ class InsertReduction(Entity):
)


class InsertReductionPDIReference(EntityReference):
aalbino2 marked this conversation as resolved.
Show resolved Hide resolved
"""
A section used for referencing a FilledSubstrateHolderPDI.
"""

reference = Quantity(
type=InsertReduction,
description='Optional description of insert if used.',
a_eln=ELNAnnotation(
component='ReferenceEditQuantity',
label='Insert Reduction Reference',
),
)


class SubstrateHolderPosition(ArchiveSection):
"""
One casing position of the substrate holder.
Expand Down Expand Up @@ -159,14 +175,6 @@ class SubstrateHolderPosition(ArchiveSection):
slot_geometry = SubSection(
section_def=Geometry,
)
insert_reduction = Quantity(
type=InsertReduction,
description='Optional description of insert if used.',
a_eln=ELNAnnotation(
component='ReferenceEditQuantity',
label='ThinFilmStackMbe Reference',
),
)


class SubstrateHolder(Entity):
Expand All @@ -192,7 +200,7 @@ class SubstrateHolder(Entity):
component=ELNComponentEnum.StringEditQuantity, label='holder_id'
),
)
material = SubSection(section_def=PubChemPureSubstanceSection, repeats=True)
holder_material = SubSection(section_def=PubChemPureSubstanceSection, repeats=True)
thickness = Quantity(
type=float,
unit='meter',
Expand Down Expand Up @@ -243,6 +251,12 @@ class FilledSubstrateHolderPosition(SubstrateHolderPosition):
One casing position of the filled substrate holder.
"""

insert_reduction = SubSection(
section_def=InsertReductionPDIReference,
aalbino2 marked this conversation as resolved.
Show resolved Hide resolved
description="""
The Insert reduction placed in this position.
""",
)
substrate = SubSection(
section_def=CompositeSystemReference,
description="""
Expand All @@ -261,7 +275,7 @@ class FilledSubstrateHolder(SubstrateHolder):
description='A reference to an empty substrate holder.',
a_eln=ELNAnnotation(
component='ReferenceEditQuantity',
label='ThinFilmStackMbe Reference',
label='Empty Substrate Holder Reference',
),
)
positions = SubSection(
Expand Down