pigeon-tem-comms 1.0.0__py3-none-any.whl → 1.1.1__py3-none-any.whl

TEM_comms/__init__.py

@@ -26,8 +26,7 @@ topics = {
     "ui.edit": ui.Edit,
     "ui.run": ui.Run,
     "ui.setup": ui.Setup,
-    "montage.start": montage.Start,
-    "montage.finished": montage.Finished,
+    "montage.complete": montage.Complete,
     "qc.status": qc.Status,
     "roi.load": roi.LoadROI,
     "roi.create": roi.CreateROI,

TEM_comms/camera.py

@@ -1,10 +1,9 @@
 from pigeon import BaseMessage
+from .tile.metadata import TileMetadata
 from typing import Optional
 
 
-class Command(BaseMessage):
-    tile_id: str
-    montage_id: str
+class Command(TileMetadata):
     brightfield: Optional[bool] = False
     darkfield: Optional[bool] = False
     lens_correction: Optional[bool] = True
@@ -32,3 +31,4 @@ class Status(BaseMessage):
     device_name: str
     device_model_id: int
     device_sn: str
+    bit_depth: int

TEM_comms/montage.py

@@ -1,18 +1,16 @@
 from pigeon import BaseMessage
-from typing import Mapping, List, Any, Optional
+from typing import Mapping, List, Any, Optional, Tuple
+from datetime import datetime
 
 
-class Start(BaseMessage):
+class Complete(BaseMessage):
     montage_id: str
-    num_tiles: int
-
-
-class Finished(BaseMessage):
-    montage_id: str
-    num_tiles: int
-    roi: str
-    specimen: str
-    metadata: Mapping[str, Any] | List[Any]
+    tile_ids: List[str]
+    acquisition_id: str
+    start_time: datetime
+    pixel_size: float
+    rotation_angle: float
+    aperture_centroid: Tuple[int, int]
 
 
 class Minimap(BaseMessage):

TEM_comms/scope.py

@@ -9,6 +9,7 @@ class Command(BaseMessage):
     mag: Optional[int] = None
     brightness: Optional[int] = None
     beam_offset: Optional[Tuple[int, int]] = None
+    spot_size: Optional[int] = None
     screen: Optional[Literal["up", "down"]] = None
 
     @model_validator(mode="after")
@@ -25,4 +26,5 @@ class Status(BaseMessage):
     tank_voltage: int
     brightness: int
     beam_offset: Tuple[int, int]
+    spot_size: int
     screen: Literal["up", "down"] | None

TEM_comms/tile/statistics.py

@@ -14,3 +14,4 @@ class MinMaxMean(TileMetadata):
     min: int
     max: int
     mean: int
+    std: int

{pigeon_tem_comms-1.0.0.dist-info → pigeon_tem_comms-1.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pigeon-tem-comms
-Version: 1.0.0
+Version: 1.1.1
 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.0.0.dist-info → pigeon_tem_comms-1.1.1.dist-info}/RECORD

@@ -1,10 +1,10 @@
-TEM_comms/__init__.py,sha256=ujCgc64ihXYl3uvwxW6zfQGIAxiMBoV-betCiMMBuCQ,1300
+TEM_comms/__init__.py,sha256=lP9VixOSpFW0h0kPq-z-pUOpD53RBat6_G3ZrFyUuqI,1264
 TEM_comms/buffer.py,sha256=Jr6fUIbUPreQSSGKWR7jkA1McyZZv3lVE8uQSER8VL4,123
-TEM_comms/camera.py,sha256=uOw8uEfNc0DqhOyNce4-OBHcLpdZU24zG06ibHvehHQ,669
-TEM_comms/montage.py,sha256=H4bpqSfJLroR3WBoSY2KdPrE8A2WXrDgzp0wAA0M0oE,505
+TEM_comms/camera.py,sha256=xzym-PLP3SWHWVqNaDSDo4uYG8TvshBAugW7FdJEWEc,692
+TEM_comms/montage.py,sha256=NmY8RGvArMwK-Qgmrc_IPzgOc3_m51YuNIUzntd62vc,541
 TEM_comms/qc.py,sha256=sujy2i0wimMvrHDPEXKdaiO7xxvRcHiy83mVpATLyqA,141
 TEM_comms/roi.py,sha256=37fKMT-KNJfWOwWvFAPTFHuBzkV1h6RS42kQsU00teQ,1145
-TEM_comms/scope.py,sha256=lPEKzWT2raR6ailiAitvWXH-Xu6fxWwYBf3GPfVIizc,761
+TEM_comms/scope.py,sha256=EfsOaEWfzT_UhYLRAYE733RoRyQQmNQc1Kz90gYLiqs,816
 TEM_comms/ui.py,sha256=Yxd0i4wjmddDl9sVzcFHHu5b6n0ICzaO0b_8SmAysxg,1459
 TEM_comms/stage/__init__.py,sha256=UVtYKzMBI01FUADS24xSItNIjhqdZtlDeJdqsDJNVIc,67
 TEM_comms/stage/aperture.py,sha256=lyJO34_K76MKrZ-o2izd5V7eEN55d3lGu__RvZq-NlA,227
@@ -12,10 +12,10 @@ TEM_comms/stage/motion.py,sha256=CqP-BS7mRP5Z9VkFT9-ePiICg6HQiviUubaO1qSioxo,287
 TEM_comms/stage/rotation.py,sha256=tUcf6IpQ2ooRDYb51Zb4pi7pQUrBuLPiLKSg8Ebb2DY,332
 TEM_comms/tile/__init__.py,sha256=ID3b4VAHqVXAkxTYOZ7H2oTSrnVdUYt4Xb6gpQ0I3qo,316
 TEM_comms/tile/metadata.py,sha256=pUxmi_C02e5nwTm51rIULkKaRz6ij5mlXylzAcDU-9c,149
-TEM_comms/tile/statistics.py,sha256=ij0ggk15J_jikIkuSDmhvY96yjliofFRN5SNdsGA0lA,232
-pigeon_tem_comms-1.0.0.dist-info/licenses/LICENSE,sha256=tZfQIUX7uNGacTb751ZWInVenJl6OwYQihcGbYrKSts,1463
-pigeon_tem_comms-1.0.0.dist-info/METADATA,sha256=L-ZnoBYgyiEYm9_XL6Qj23R8Jmju4EdXDGtjM3LgUb4,1575
-pigeon_tem_comms-1.0.0.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-pigeon_tem_comms-1.0.0.dist-info/entry_points.txt,sha256=X2WfBCDgfH9XVVqiI4rLu7BLyMNuLW6WWckqXxfbrgk,38
-pigeon_tem_comms-1.0.0.dist-info/top_level.txt,sha256=3_1RcQ7xvS2dJEYnPIigo9snoKcSXSNJzPqunY0qydI,10
-pigeon_tem_comms-1.0.0.dist-info/RECORD,,
+TEM_comms/tile/statistics.py,sha256=C1pMEOjwVrhjGR6R7efKJE-pR_tw9ZAGrprLIHcXc_A,245
+pigeon_tem_comms-1.1.1.dist-info/licenses/LICENSE,sha256=tZfQIUX7uNGacTb751ZWInVenJl6OwYQihcGbYrKSts,1463
+pigeon_tem_comms-1.1.1.dist-info/METADATA,sha256=L6nSFqG5xt96FhuO3ear6NAkHVEmc9s_O28LCYQKk9Q,1575
+pigeon_tem_comms-1.1.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+pigeon_tem_comms-1.1.1.dist-info/entry_points.txt,sha256=X2WfBCDgfH9XVVqiI4rLu7BLyMNuLW6WWckqXxfbrgk,38
+pigeon_tem_comms-1.1.1.dist-info/top_level.txt,sha256=3_1RcQ7xvS2dJEYnPIigo9snoKcSXSNJzPqunY0qydI,10
+pigeon_tem_comms-1.1.1.dist-info/RECORD,,

{pigeon_tem_comms-1.0.0.dist-info → pigeon_tem_comms-1.1.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (77.0.3)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any