Skip to content

Commit 6f8fba2

Browse files
NickHallPhysicscarandraug
authored andcommitted
ximea: add dev_id argument to __init__()
1 parent c4c24d2 commit 6f8fba2

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

microscope/cameras/ximea.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
@Pyro4.expose
4040
@Pyro4.behavior('single')
4141
class XimeaCamera(devices.CameraDevice):
42-
def __init__(self, *args, **kwargs):
42+
def __init__(self, dev_id = 0, *args, **kwargs):
4343
super(XimeaCamera, self).__init__(**kwargs)
4444
# example parameter to allow setting.
4545
# self.add_setting('_error_percent', 'int',
@@ -50,6 +50,7 @@ def __init__(self, *args, **kwargs):
5050
self._exposure_time = 0.1
5151
self._triggered = False
5252
self.handle = None
53+
self.dev_id = dev_id
5354

5455
def _purge_buffers(self):
5556
"""Purge buffers on both camera and PC."""
@@ -106,7 +107,7 @@ def initialize(self):
106107
"""
107108

108109
try:
109-
self.handle = xiapi.Camera()
110+
self.handle = xiapi.Camera(self.dev_id)
110111
self.handle.open_device()
111112
except:
112113
raise Exception("Problem opening camera.")

0 commit comments

Comments
 (0)