Merge pull request #96 from ispielma/CameraAttributes

Added pixel_size and magnification attributes to imaqdxcamera

Author: dihm

labscript_devices/IMAQdxCamera/labscript_devices.py

@@ -26,6 +26,8 @@ class IMAQdxCamera(TriggerableDevice):
             "connection_table_properties": [
                 "serial_number",
                 "orientation",
+                "pixel_size",
+                "magnification",
                 "manual_mode_camera_attributes",
                 "mock",
             ],
@@ -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,
@@ -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
@@ -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