diff --git a/instamatic/camera/camera_client.py b/instamatic/camera/camera_client.py index 8f36ada8..5f49096b 100644 --- a/instamatic/camera/camera_client.py +++ b/instamatic/camera/camera_client.py @@ -7,9 +7,9 @@ import numpy as np from instamatic import config +from instamatic.exceptions import exception_list from instamatic.server.serializer import pickle_dumper as dumper from instamatic.server.serializer import pickle_loader as loader -from instamatic.exceptions import exception_list if config.settings.cam_use_shared_memory: from multiprocessing import shared_memory @@ -43,10 +43,10 @@ class CamClient: """ def __init__( - self, + self, name: str, interface: str, - ): + ): super().__init__() self.name = name @@ -126,12 +126,12 @@ def _eval_dct(self, dct): response = self.s.recv(self._imagebufsize) else: response = self.s.recv(self._bufsize) - + if response: status, data = loader(response) if self.use_shared_memory and acquiring_image: - data = self.get_data_from_shared_memory(**data) + data = self.get_data_from_shared_memory(**data) if status == 200: return data diff --git a/instamatic/camera/camera_emmenu.py b/instamatic/camera/camera_emmenu.py index c8a2d30c..bf01d452 100644 --- a/instamatic/camera/camera_emmenu.py +++ b/instamatic/camera/camera_emmenu.py @@ -59,10 +59,10 @@ class CameraEMMENU: """ def __init__( - self, - drc_name: str = 'Diffraction', + self, + drc_name: str = 'Diffraction', name: str = 'emmenu', - ): + ): """Initialize camera module.""" super().__init__() diff --git a/instamatic/camera/camera_gatan2.py b/instamatic/camera/camera_gatan2.py index a701abfc..6de4b3c9 100644 --- a/instamatic/camera/camera_gatan2.py +++ b/instamatic/camera/camera_gatan2.py @@ -14,7 +14,7 @@ class CameraGatan2: """Connect to Digital Microsgraph using the SerialEM Plugin.""" - def __init__(self, name: str="gatan2"): + def __init__(self, name: str = 'gatan2'): """Initialize camera module.""" super().__init__()