Skip to content

Commit

Permalink
Format code
Browse files Browse the repository at this point in the history
  • Loading branch information
stefsmeets committed Jul 1, 2020
1 parent 3e9c23c commit e46c8c0
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions instamatic/camera/camera_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -43,10 +43,10 @@ class CamClient:
"""

def __init__(
self,
self,
name: str,
interface: str,
):
):
super().__init__()

self.name = name
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions instamatic/camera/camera_emmenu.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__()

Expand Down
2 changes: 1 addition & 1 deletion instamatic/camera/camera_gatan2.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__()

Expand Down

0 comments on commit e46c8c0

Please sign in to comment.