Skip to content

Commit 7c463c8

Browse files
author
spielman
committed
Added exception_on_failed_shot attribute to all devices that subclass IMAQdx imaging, but did not actually implement code to catch their internal errors.
1 parent ba4c4dd commit 7c463c8

File tree

4 files changed

+6
-1
lines changed

4 files changed

+6
-1
lines changed

labscript_devices/AndorSolis/blacs_workers.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ def __init__(self):
2020
from .andor_sdk.andor_utils import AndorCam
2121
self.camera = AndorCam()
2222
self.attributes = self.camera.default_acquisition_attrs
23+
self.exception_on_failed_shot = True
2324

2425
def set_attributes(self, attr_dict):
2526
self.attributes.update(attr_dict)

labscript_devices/FlyCapture2Camera/blacs_workers.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@ def __init__(self, serial_number):
9191
self.pixel_formats = IntEnum('pixel_formats',fmts)
9292

9393
self._abort_acquisition = False
94-
94+
self.exception_on_failed_shot = True
95+
9596
# check if GigE camera. If so, ensure max packet size is used
9697
cam_info = self.camera.getCameraInfo()
9798
if cam_info.interfaceType == PyCapture2.INTERFACE_TYPE.GIGE:

labscript_devices/PylonCamera/blacs_workers.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ def __init__(self, serial_number):
4545
# Keep a nodeMap reference so we don't have to re-create a lot
4646
self.nodeMap = self.camera.GetNodeMap()
4747
self._abort_acquisition = False
48+
self.exception_on_failed_shot = True
49+
4850

4951
def set_attributes(self, attributes_dict):
5052
"""Sets all attribues in attr_dict.

labscript_devices/SpinnakerCamera/blacs_workers.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ def __init__(self, serial_number):
5555

5656
# Set the abort acquisition thingy:
5757
self._abort_acquisition = False
58+
self.exception_on_failed_shot = True
5859

5960
def get_attribute_names(self, visibility):
6061
names = []

0 commit comments

Comments
 (0)