pigeon-tem-comms 1.2.0__tar.gz → 1.3.0__tar.gz

{pigeon_tem_comms-1.2.0/pigeon_tem_comms.egg-info → pigeon_tem_comms-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pigeon-tem-comms
-Version: 1.2.0
+Version: 1.3.0
 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-1.2.0 → pigeon_tem_comms-1.3.0}/TEM_comms/__init__.py

@@ -1,4 +1,9 @@
-from . import buffer, camera, montage, qc, roi, scope, stage, tile, ui
+from pigeon import BaseMessage
+from . import buffer, camera, montage, qc, roi, scope, stage, tile, ui, calibration
+
+
+class State(BaseMessage):
+    state: str
 
 
 topics = {
@@ -32,4 +37,7 @@ topics = {
     "roi.create": roi.CreateROI,
     "roi.current": roi.ROI,
     "montage.minimaps": montage.Minimaps,
+    "calibration.resolution": calibration.Resolution,
+    "calibration.centroid": calibration.Centroid,
+    "state": State,
 }

pigeon_tem_comms-1.3.0/TEM_comms/calibration.py

@@ -0,0 +1,18 @@
+from pigeon import BaseMessage
+from typing import Mapping
+
+
+class _Resolution(BaseMessage):
+    nm_per_px: tuple[float, float]
+    rotation: float
+
+
+class Resolution(BaseMessage):
+    lowmag: Mapping[int, _Resolution]
+    mag: Mapping[int, _Resolution]
+
+
+class Centroid(BaseMessage):
+    aperture_id: int
+    x: int
+    y: int

{pigeon_tem_comms-1.2.0 → pigeon_tem_comms-1.3.0}/TEM_comms/ui.py

@@ -20,6 +20,7 @@ class Run(BaseMessage):
     abort_now: bool = False
     abort_at_end: bool = False
     resume: bool = False
+    cancel: bool = False
 
     @model_validator(mode="after")
     def check_grid(self):

{pigeon_tem_comms-1.2.0 → pigeon_tem_comms-1.3.0/pigeon_tem_comms.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pigeon-tem-comms
-Version: 1.2.0
+Version: 1.3.0
 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-1.2.0 → pigeon_tem_comms-1.3.0}/pigeon_tem_comms.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ README.md
 pyproject.toml
 TEM_comms/__init__.py
 TEM_comms/buffer.py
+TEM_comms/calibration.py
 TEM_comms/camera.py
 TEM_comms/montage.py
 TEM_comms/qc.py
@@ -23,6 +24,7 @@ pigeon_tem_comms.egg-info/entry_points.txt
 pigeon_tem_comms.egg-info/requires.txt
 pigeon_tem_comms.egg-info/top_level.txt
 tests/test_buffer.py
+tests/test_calibration.py
 tests/test_camera.py
 tests/test_qc.py
 tests/test_scope_command.py

{pigeon_tem_comms-1.2.0 → pigeon_tem_comms-1.3.0}/pyproject.toml

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

pigeon_tem_comms-1.3.0/tests/test_calibration.py

@@ -0,0 +1,36 @@
+from TEM_comms.calibration import Resolution
+import pytest
+import json
+
+
+@pytest.mark.parametrize(
+    "data",
+    [
+        {
+            "mag": {},
+            "lowmag": {},
+        },
+        {
+            "mag": {},
+            "lowmag": {50: {"nm_per_px": (180.4, 170.6), "rotation": 3.14}},
+        },
+        {
+            "mag": {3000: {"nm_per_px": (4.5, 4.7), "rotation": 1.5}},
+            "lowmag": {},
+        },
+        {
+            "mag": {3000: {"nm_per_px": (4.5, 4.7), "rotation": 1.5}},
+            "lowmag": {50: {"nm_per_px": (180.4, 170.6), "rotation": 3.14}},
+        },
+        {
+            "mag": {
+                3000: {"nm_per_px": (4.5, 4.7), "rotation": 1.5},
+                1500: {"nm_per_px": (7.1, 7.3), "rotation": 2.1},
+            },
+            "lowmag": {50: {"nm_per_px": (180.4, 170.6), "rotation": 3.14}},
+        },
+    ],
+)
+def test_calibration(data):
+    msg = Resolution(**data)
+    assert Resolution.deserialize(msg.serialize()) == msg