Skip to content

Added pixel_size and magnification attributes to imaqdxcamera #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 28, 2022
Merged

Added pixel_size and magnification attributes to imaqdxcamera #96

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b33558
Added pixel_size and magnification attributes to imaqdxcamera
Feb 9, 2022
39eb80b
Merge remote-tracking branch 'origin/master' into CameraAttributes
Apr 22, 2022
410a671
Updated to connection table properties.
Apr 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions labscript_devices/IMAQdxCamera/labscript_devices.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ class IMAQdxCamera(TriggerableDevice):
"connection_table_properties": [
"serial_number",
"orientation",
"pixel_size",
"magnification",
"manual_mode_camera_attributes",
"mock",
],
Expand All @@ -44,6 +46,8 @@ def __init__(
connection,
serial_number,
orientation=None,
pixel_size=[1.0,1.0],
magnification=1.0,
trigger_edge_type='rising',
trigger_duration=None,
minimum_recovery_time=0.0,
Expand Down Expand Up @@ -76,6 +80,14 @@ def __init__(
to determine the location in the shot file where the images will be
saved. If not given, the device name will be used instead.

pixel_size ([float,float], optional), default: `[1.0, 1.0]`
The x and y size of the pixels in micrometers. This can be used
in setting the scale in the blacs image display as well as
extracted in lyse for analysis.

magnification (float, optional), default: `1.0`
Imaging system magnification.

trigger_edge_type (str), default: `'rising'`
The direction of the desired edges to be generated on the parent
devices's digital output used for triggering. Must be 'rising' or
Expand Down Expand Up @@ -145,6 +157,8 @@ def __init__(
self.minimum_recovery_time = minimum_recovery_time
self.trigger_duration = trigger_duration
self.orientation = orientation
self.pixel_size = pixel_size
self.magnification = magnification
if isinstance(serial_number, (str, bytes)):
serial_number = int(serial_number, 16)
self.serial_number = serial_number
Expand Down