pigeon-tem-comms 0.4.1__tar.gz → 0.4.3__tar.gz

{pigeon_tem_comms-0.4.1 → pigeon_tem_comms-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pigeon-tem-comms
-Version: 0.4.1
+Version: 0.4.3
 Summary: Pigeon messages for the next generation TEM imaging system.
 Author-email: Cameron Devine <cameron.devine@alleninstitute.org>
 License: BSD 3 Clause

pigeon_tem_comms-0.4.3/TEM_comms/scope.py

@@ -0,0 +1,28 @@
+from pigeon import BaseMessage
+from typing import Literal, Optional, Tuple
+from pydantic import model_validator
+
+
+class Command(BaseMessage):
+    focus: Optional[int] = None
+    mag_mode: Optional[Literal["LM", "MAG1", "MAG2"]] = None
+    mag: Optional[int] = None
+    brightness: Optional[int] = None
+    beam_offset: Optional[Tuple[int, int]] = None
+    screen: Optional[Literal["up", "down"]] = None
+
+    @model_validator(mode="after")
+    def check_mag(self):
+        assert (self.mag_mode is None) == (self.mag is None)
+        return self
+
+
+class Status(BaseMessage):
+    focus: int
+    aperture: str | None
+    mag_mode: str
+    mag: int
+    tank_voltage: int
+    brightness: int
+    beam_offset: Tuple[int, int]
+    screen: Literal["up", "down"] | None

{pigeon_tem_comms-0.4.1 → pigeon_tem_comms-0.4.3}/TEM_comms/ui.py

@@ -40,3 +40,7 @@ class Setup(BaseMessage):
     lens_correction: bool = False
     acquire_brightfield: bool = False
     acquire_darkfield: bool = False
+    center_beam: bool = False
+    spread_beam: bool = False
+    find_aperture: bool = False
+    grid: Optional[int] = None

{pigeon_tem_comms-0.4.1 → pigeon_tem_comms-0.4.3}/pigeon_tem_comms.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pigeon-tem-comms
-Version: 0.4.1
+Version: 0.4.3
 Summary: Pigeon messages for the next generation TEM imaging system.
 Author-email: Cameron Devine <cameron.devine@alleninstitute.org>
 License: BSD 3 Clause

{pigeon_tem_comms-0.4.1 → pigeon_tem_comms-0.4.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pigeon-tem-comms"
-version = "0.4.1"
+version = "0.4.3"
 authors = [
   { name="Cameron Devine", email="cameron.devine@alleninstitute.org" },
 ]

pigeon_tem_comms-0.4.1/TEM_comms/scope.py

@@ -1,22 +0,0 @@
-from pigeon import BaseMessage
-from typing import Literal
-from pydantic import model_validator
-
-
-class Command(BaseMessage):
-    focus: int | None = None
-    mag_mode: Literal["LM", "MAG1", "MAG2"] | None = None
-    mag: int | None = None
-
-    @model_validator(mode="after")
-    def check_mag(self):
-        assert (self.mag_mode is None) == (self.mag is None)
-        return self
-
-
-class Status(BaseMessage):
-    focus: int
-    aperture: str | None
-    mag_mode: str
-    mag: int
-    tank_voltage: int