Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
8 changes: 6 additions & 2 deletions src/pals/kinds/Marker.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
from typing import Literal

from .mixin import ThinElement
from .mixin import BaseElement


class Marker(ThinElement):
class Marker(BaseElement):
"""Zero length element to mark a particular position

The main purpose of this thin element is to name a position in the beamline.
"""

# Discriminator field
kind: Literal["Marker"] = "Marker"

# Segment length in meters (m)
# Always 0, cannot be modified
length: Literal[0.0] = 0.0
4 changes: 2 additions & 2 deletions src/pals/kinds/mixin/ThickElement.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from typing import Annotated, Literal
from annotated_types import Gt
from annotated_types import Ge

from . import BaseElement

Expand All @@ -11,4 +11,4 @@ class ThickElement(BaseElement):
kind: Literal["ThickElement"] = "ThickElement"

# Segment length in meters (m)
length: Annotated[float, Gt(0)]
length: Annotated[float, Ge(0)]
14 changes: 0 additions & 14 deletions src/pals/kinds/mixin/ThinElement.py

This file was deleted.

1 change: 0 additions & 1 deletion src/pals/kinds/mixin/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
from .BaseElement import BaseElement # noqa: F401
from .ThickElement import ThickElement # noqa: F401
from .ThinElement import ThinElement # noqa: F401