zaber-motion 7.11.0__py3-none-win_amd64.whl → 7.12.0__py3-none-win_amd64.whl

zaber_motion/ascii/axis_settings.py

@@ -669,7 +669,7 @@ class AxisSettings:
             axis_settings=list(axis_settings),
         )
         response = call(
-            "device/get_many_settings",
+            "device/get_many_axis_settings",
             request,
             dto.GetAxisSettingResults.from_binary)
         return response.results
@@ -694,7 +694,7 @@ class AxisSettings:
             axis_settings=list(axis_settings),
         )
         response = await call_async(
-            "device/get_many_settings",
+            "device/get_many_axis_settings",
             request,
             dto.GetAxisSettingResults.from_binary)
         return response.results
@@ -720,7 +720,7 @@ class AxisSettings:
             axis_settings=list(axis_settings),
         )
         response = call(
-            "device/get_sync_settings",
+            "device/get_sync_axis_settings",
             request,
             dto.GetAxisSettingResults.from_binary)
         return response.results
@@ -746,7 +746,7 @@ class AxisSettings:
             axis_settings=list(axis_settings),
         )
         response = await call_async(
-            "device/get_sync_settings",
+            "device/get_sync_axis_settings",
             request,
             dto.GetAxisSettingResults.from_binary)
         return response.results

zaber_motion/ascii/pvt_buffer.py

@@ -1,6 +1,7 @@
 # ===== THIS FILE IS GENERATED FROM A TEMPLATE ===== #
 # ============== DO NOT EDIT DIRECTLY ============== #
 from typing import TYPE_CHECKING, List
+from ..dto.ascii.pvt_sequence_data import PvtSequenceData
 from ..dto import requests as dto
 from ..call import call, call_async
 
@@ -74,6 +75,46 @@ class PvtBuffer:
             dto.StreamBufferGetContentResponse.from_binary)
         return response.buffer_lines
 
+    def retrieve_sequence_data(
+            self
+    ) -> PvtSequenceData:
+        """
+        Gets the buffer contents as a PvtSequenceData object.
+
+        Returns:
+            The PVT data loaded from the buffer.
+        """
+        request = dto.PvtBufferGetSequenceDataRequest(
+            interface_id=self.device.connection.interface_id,
+            device=self.device.device_address,
+            buffer_id=self.buffer_id,
+        )
+        response = call(
+            "device/pvt_buffer_get_data",
+            request,
+            PvtSequenceData.from_binary)
+        return response
+
+    async def retrieve_sequence_data_async(
+            self
+    ) -> PvtSequenceData:
+        """
+        Gets the buffer contents as a PvtSequenceData object.
+
+        Returns:
+            The PVT data loaded from the buffer.
+        """
+        request = dto.PvtBufferGetSequenceDataRequest(
+            interface_id=self.device.connection.interface_id,
+            device=self.device.device_address,
+            buffer_id=self.buffer_id,
+        )
+        response = await call_async(
+            "device/pvt_buffer_get_data",
+            request,
+            PvtSequenceData.from_binary)
+        return response
+
     def erase(
             self
     ) -> None:

zaber_motion/ascii/pvt_sequence.py

@@ -525,6 +525,8 @@ class PvtSequence:
         per axis, And the values arrays for each sequence must be equal in length to each other and also to the
         times sequence.
 
+        Does not support native units.
+
         Args:
             positions: Positions for the axes to move through, relative to their home positions.
                 Each MeasurementSequence represents a sequence of positions along a particular dimension.
@@ -569,6 +571,8 @@ class PvtSequence:
         per axis, And the values arrays for each sequence must be equal in length to each other and also to the
         times sequence.
 
+        Does not support native units.
+
         Args:
             positions: Positions for the axes to move through, relative to their home positions.
                 Each MeasurementSequence represents a sequence of positions along a particular dimension.
@@ -610,6 +614,8 @@ class PvtSequence:
         velocity measurement sequence per axis, and the values arrays for each sequence
         must be equal in length to each other and also to the times sequence.
 
+        Does not support native units.
+
         Args:
             velocities: The sequence of velocities for each axis.
                 Each MeasurementSequence represents a sequence of velocities along particular dimension.
@@ -647,6 +653,8 @@ class PvtSequence:
         velocity measurement sequence per axis, and the values arrays for each sequence
         must be equal in length to each other and also to the times sequence.
 
+        Does not support native units.
+
         Args:
             velocities: The sequence of velocities for each axis.
                 Each MeasurementSequence represents a sequence of velocities along particular dimension.
@@ -670,6 +678,108 @@ class PvtSequence:
             PvtSequenceData.from_binary)
         return response
 
+    @staticmethod
+    def generate_velocities_and_times(
+            positions: List[MeasurementSequence],
+            target_speed: Measurement,
+            target_acceleration: Measurement,
+            resample_number: Optional[int] = None
+    ) -> PvtSequenceData:
+        """
+        Generates sequences of velocities and times for a sequence of positions.
+        This function fits a geometric spline (not-a-knot cubic for sequences of >3 points,
+        natural cubic for 3, and a straight line for 2) over the position sequence
+        and then calculates the velocity and time information by traversing it using a
+        trapezoidal motion profile.
+
+        This generation scheme attempts to keep speed and acceleration less than the
+        specified target values, but does not guarantee it. Generally speaking, a higher
+        resample number will bring the generated trajectory closer to respecting these
+        limits.
+
+        Note that consecutive duplicate points will be automatically removed as they
+        have no geometric significance without additional time information. Also note that
+        for multi-dimensional paths this function expects axes to be linear and orthogonal,
+        however for paths of a single dimension rotary units are accepted.
+
+        Does not support native units.
+
+        Args:
+            positions: Positions for the axes to move through, relative to their home positions.
+            target_speed: The target speed used to generate positions and times.
+            target_acceleration: The target acceleration used to generate positions and times.
+            resample_number: The number of points to resample the sequence by.
+                Leave undefined to use the specified points.
+
+        Returns:
+            Object containing the generated PVT sequence. Note that returned time sequence is always relative.
+        """
+        if target_speed.value <= 0 or target_acceleration.value <= 0:
+            raise ValueError('Target speed and acceleration values must be greater than zero.')
+
+        request = dto.PvtGenerateVelocitiesAndTimesRequest(
+            positions=positions,
+            target_speed=target_speed,
+            target_acceleration=target_acceleration,
+            resample_number=resample_number,
+        )
+        response = call(
+            "device/pvt_generate_velocities_and_times",
+            request,
+            PvtSequenceData.from_binary)
+        return response
+
+    @staticmethod
+    async def generate_velocities_and_times_async(
+            positions: List[MeasurementSequence],
+            target_speed: Measurement,
+            target_acceleration: Measurement,
+            resample_number: Optional[int] = None
+    ) -> PvtSequenceData:
+        """
+        Generates sequences of velocities and times for a sequence of positions.
+        This function fits a geometric spline (not-a-knot cubic for sequences of >3 points,
+        natural cubic for 3, and a straight line for 2) over the position sequence
+        and then calculates the velocity and time information by traversing it using a
+        trapezoidal motion profile.
+
+        This generation scheme attempts to keep speed and acceleration less than the
+        specified target values, but does not guarantee it. Generally speaking, a higher
+        resample number will bring the generated trajectory closer to respecting these
+        limits.
+
+        Note that consecutive duplicate points will be automatically removed as they
+        have no geometric significance without additional time information. Also note that
+        for multi-dimensional paths this function expects axes to be linear and orthogonal,
+        however for paths of a single dimension rotary units are accepted.
+
+        Does not support native units.
+
+        Args:
+            positions: Positions for the axes to move through, relative to their home positions.
+            target_speed: The target speed used to generate positions and times.
+            target_acceleration: The target acceleration used to generate positions and times.
+            resample_number: The number of points to resample the sequence by.
+                Leave undefined to use the specified points.
+
+        Returns:
+            Object containing the generated PVT sequence. Note that returned time sequence is always relative.
+        """
+        if target_speed.value <= 0 or target_acceleration.value <= 0:
+            raise ValueError('Target speed and acceleration values must be greater than zero.')
+
+        request = dto.PvtGenerateVelocitiesAndTimesRequest(
+            positions=positions,
+            target_speed=target_speed,
+            target_acceleration=target_acceleration,
+            resample_number=resample_number,
+        )
+        response = await call_async(
+            "device/pvt_generate_velocities_and_times",
+            request,
+            PvtSequenceData.from_binary)
+        return response
+
     def wait_until_idle(
             self,
             throw_error_on_fault: bool = True
@@ -1203,6 +1313,42 @@ class PvtSequence:
             PvtCsvData.from_binary)
         return response
 
+    def submit_sequence_data(
+            self,
+            sequence_data: PvtSequenceData
+    ) -> None:
+        """
+        Writes the contents of a PvtSequenceData object to the sequence.
+
+        Args:
+            sequence_data: The PVT sequence data to submit.
+        """
+        request = dto.PvtSubmitSequenceDataRequest(
+            interface_id=self.device.connection.interface_id,
+            device=self.device.device_address,
+            stream_id=self.pvt_id,
+            sequence_data=sequence_data,
+        )
+        call("device/stream_pvt_submit_data", request)
+
+    async def submit_sequence_data_async(
+            self,
+            sequence_data: PvtSequenceData
+    ) -> None:
+        """
+        Writes the contents of a PvtSequenceData object to the sequence.
+
+        Args:
+            sequence_data: The PVT sequence data to submit.
+        """
+        request = dto.PvtSubmitSequenceDataRequest(
+            interface_id=self.device.connection.interface_id,
+            device=self.device.device_address,
+            stream_id=self.pvt_id,
+            sequence_data=sequence_data,
+        )
+        await call_async("device/stream_pvt_submit_data", request)
+
     def set_digital_output(
             self,
             channel_number: int,

zaber_motion/dto/requests/__init__.py

@@ -141,12 +141,15 @@ from .oscilloscope_request import OscilloscopeRequest as OscilloscopeRequest
 from .oscilloscope_start_request import OscilloscopeStartRequest as OscilloscopeStartRequest
 from .prepare_command_request import PrepareCommandRequest as PrepareCommandRequest
 from .process_on import ProcessOn as ProcessOn
+from .pvt_buffer_get_sequence_data_request import PvtBufferGetSequenceDataRequest as PvtBufferGetSequenceDataRequest
 from .pvt_generate_positions_request import PvtGeneratePositionsRequest as PvtGeneratePositionsRequest
+from .pvt_generate_velocities_and_times_request import PvtGenerateVelocitiesAndTimesRequest as PvtGenerateVelocitiesAndTimesRequest
 from .pvt_generate_velocities_request import PvtGenerateVelocitiesRequest as PvtGenerateVelocitiesRequest
 from .pvt_load_csv_request import PvtLoadCsvRequest as PvtLoadCsvRequest
 from .pvt_point_request import PvtPointRequest as PvtPointRequest
 from .pvt_points_request import PvtPointsRequest as PvtPointsRequest
 from .pvt_save_csv_request import PvtSaveCsvRequest as PvtSaveCsvRequest
+from .pvt_submit_sequence_data_request import PvtSubmitSequenceDataRequest as PvtSubmitSequenceDataRequest
 from .renumber_request import RenumberRequest as RenumberRequest
 from .response_type import ResponseType as ResponseType
 from .servo_tuning_paramset_response import ServoTuningParamsetResponse as ServoTuningParamsetResponse

zaber_motion/dto/requests/pvt_buffer_get_sequence_data_request.py

@@ -0,0 +1,79 @@
+# This file is generated. Do not modify by hand.
+# pylint: disable=line-too-long, unused-argument, f-string-without-interpolation, too-many-branches, too-many-statements, unnecessary-pass
+from dataclasses import dataclass
+from typing import Any, Dict
+import decimal
+import zaber_bson
+
+
+@dataclass
+class PvtBufferGetSequenceDataRequest:
+
+    interface_id: int = 0
+
+    device: int = 0
+
+    buffer_id: int = 0
+
+    @staticmethod
+    def zero_values() -> 'PvtBufferGetSequenceDataRequest':
+        return PvtBufferGetSequenceDataRequest(
+            interface_id=0,
+            device=0,
+            buffer_id=0,
+        )
+
+    @staticmethod
+    def from_binary(data_bytes: bytes) -> 'PvtBufferGetSequenceDataRequest':
+        """" Deserialize a binary representation of this class. """
+        data = zaber_bson.loads(data_bytes)  # type: Dict[str, Any]
+        return PvtBufferGetSequenceDataRequest.from_dict(data)
+
+    def to_binary(self) -> bytes:
+        """" Serialize this class to a binary representation. """
+        self.validate()
+        return zaber_bson.dumps(self.to_dict())  # type: ignore
+
+    def to_dict(self) -> Dict[str, Any]:
+        return {
+            'interfaceId': int(self.interface_id),
+            'device': int(self.device),
+            'bufferId': int(self.buffer_id),
+        }
+
+    @staticmethod
+    def from_dict(data: Dict[str, Any]) -> 'PvtBufferGetSequenceDataRequest':
+        return PvtBufferGetSequenceDataRequest(
+            interface_id=data.get('interfaceId'),  # type: ignore
+            device=data.get('device'),  # type: ignore
+            buffer_id=data.get('bufferId'),  # type: ignore
+        )
+
+    def validate(self) -> None:
+        """" Validates the properties of the instance. """
+        if self.interface_id is None:
+            raise ValueError(f'Property "InterfaceId" of "PvtBufferGetSequenceDataRequest" is None.')
+
+        if not isinstance(self.interface_id, (int, float, decimal.Decimal)):
+            raise ValueError(f'Property "InterfaceId" of "PvtBufferGetSequenceDataRequest" is not a number.')
+
+        if int(self.interface_id) != self.interface_id:
+            raise ValueError(f'Property "InterfaceId" of "PvtBufferGetSequenceDataRequest" is not integer value.')
+
+        if self.device is None:
+            raise ValueError(f'Property "Device" of "PvtBufferGetSequenceDataRequest" is None.')
+
+        if not isinstance(self.device, (int, float, decimal.Decimal)):
+            raise ValueError(f'Property "Device" of "PvtBufferGetSequenceDataRequest" is not a number.')
+
+        if int(self.device) != self.device:
+            raise ValueError(f'Property "Device" of "PvtBufferGetSequenceDataRequest" is not integer value.')
+
+        if self.buffer_id is None:
+            raise ValueError(f'Property "BufferId" of "PvtBufferGetSequenceDataRequest" is None.')
+
+        if not isinstance(self.buffer_id, (int, float, decimal.Decimal)):
+            raise ValueError(f'Property "BufferId" of "PvtBufferGetSequenceDataRequest" is not a number.')
+
+        if int(self.buffer_id) != self.buffer_id:
+            raise ValueError(f'Property "BufferId" of "PvtBufferGetSequenceDataRequest" is not integer value.')

zaber_motion/dto/requests/pvt_generate_velocities_and_times_request.py

@@ -0,0 +1,96 @@
+# This file is generated. Do not modify by hand.
+# pylint: disable=line-too-long, unused-argument, f-string-without-interpolation, too-many-branches, too-many-statements, unnecessary-pass
+from dataclasses import dataclass, field
+from typing import Any, Dict, List, Optional
+import decimal
+from collections.abc import Iterable
+import zaber_bson
+from ..ascii.measurement_sequence import MeasurementSequence
+from ..measurement import Measurement
+
+
+@dataclass
+class PvtGenerateVelocitiesAndTimesRequest:
+
+    positions: List[MeasurementSequence] = field(default_factory=list)
+
+    target_speed: Measurement = field(default_factory=Measurement.zero_values)
+
+    target_acceleration: Measurement = field(default_factory=Measurement.zero_values)
+
+    resample_number: Optional[int] = None
+
+    @staticmethod
+    def zero_values() -> 'PvtGenerateVelocitiesAndTimesRequest':
+        return PvtGenerateVelocitiesAndTimesRequest(
+            positions=[],
+            target_speed=Measurement.zero_values(),
+            target_acceleration=Measurement.zero_values(),
+            resample_number=None,
+        )
+
+    @staticmethod
+    def from_binary(data_bytes: bytes) -> 'PvtGenerateVelocitiesAndTimesRequest':
+        """" Deserialize a binary representation of this class. """
+        data = zaber_bson.loads(data_bytes)  # type: Dict[str, Any]
+        return PvtGenerateVelocitiesAndTimesRequest.from_dict(data)
+
+    def to_binary(self) -> bytes:
+        """" Serialize this class to a binary representation. """
+        self.validate()
+        return zaber_bson.dumps(self.to_dict())  # type: ignore
+
+    def to_dict(self) -> Dict[str, Any]:
+        return {
+            'positions': [item.to_dict() for item in self.positions] if self.positions is not None else [],
+            'targetSpeed': self.target_speed.to_dict(),
+            'targetAcceleration': self.target_acceleration.to_dict(),
+            'resampleNumber': int(self.resample_number) if self.resample_number is not None else None,
+        }
+
+    @staticmethod
+    def from_dict(data: Dict[str, Any]) -> 'PvtGenerateVelocitiesAndTimesRequest':
+        return PvtGenerateVelocitiesAndTimesRequest(
+            positions=[MeasurementSequence.from_dict(item) for item in data.get('positions')],  # type: ignore
+            target_speed=Measurement.from_dict(data.get('targetSpeed')),  # type: ignore
+            target_acceleration=Measurement.from_dict(data.get('targetAcceleration')),  # type: ignore
+            resample_number=data.get('resampleNumber'),  # type: ignore
+        )
+
+    def validate(self) -> None:
+        """" Validates the properties of the instance. """
+        if self.positions is not None:
+            if not isinstance(self.positions, Iterable):
+                raise ValueError('Property "Positions" of "PvtGenerateVelocitiesAndTimesRequest" is not iterable.')
+
+            for i, positions_item in enumerate(self.positions):
+                if positions_item is None:
+                    raise ValueError(f'Item {i} in property "Positions" of "PvtGenerateVelocitiesAndTimesRequest" is None.')
+
+                if not isinstance(positions_item, MeasurementSequence):
+                    raise ValueError(f'Item {i} in property "Positions" of "PvtGenerateVelocitiesAndTimesRequest" is not an instance of "MeasurementSequence".')
+
+                positions_item.validate()
+
+        if self.target_speed is None:
+            raise ValueError(f'Property "TargetSpeed" of "PvtGenerateVelocitiesAndTimesRequest" is None.')
+
+        if not isinstance(self.target_speed, Measurement):
+            raise ValueError(f'Property "TargetSpeed" of "PvtGenerateVelocitiesAndTimesRequest" is not an instance of "Measurement".')
+
+        self.target_speed.validate()
+
+        if self.target_acceleration is None:
+            raise ValueError(f'Property "TargetAcceleration" of "PvtGenerateVelocitiesAndTimesRequest" is None.')
+
+        if not isinstance(self.target_acceleration, Measurement):
+            raise ValueError(f'Property "TargetAcceleration" of "PvtGenerateVelocitiesAndTimesRequest" is not an instance of "Measurement".')
+
+        self.target_acceleration.validate()
+
+        if self.resample_number is not None:
+            if not isinstance(self.resample_number, (int, float, decimal.Decimal)):
+                raise ValueError(f'Property "ResampleNumber" of "PvtGenerateVelocitiesAndTimesRequest" is not a number.')
+
+            if int(self.resample_number) != self.resample_number:
+                raise ValueError(f'Property "ResampleNumber" of "PvtGenerateVelocitiesAndTimesRequest" is not integer value.')

zaber_motion/dto/requests/pvt_submit_sequence_data_request.py

@@ -0,0 +1,93 @@
+# This file is generated. Do not modify by hand.
+# pylint: disable=line-too-long, unused-argument, f-string-without-interpolation, too-many-branches, too-many-statements, unnecessary-pass
+from dataclasses import dataclass, field
+from typing import Any, Dict
+import decimal
+import zaber_bson
+from ..ascii.pvt_sequence_data import PvtSequenceData
+
+
+@dataclass
+class PvtSubmitSequenceDataRequest:
+
+    interface_id: int = 0
+
+    device: int = 0
+
+    stream_id: int = 0
+
+    sequence_data: PvtSequenceData = field(default_factory=PvtSequenceData.zero_values)
+
+    @staticmethod
+    def zero_values() -> 'PvtSubmitSequenceDataRequest':
+        return PvtSubmitSequenceDataRequest(
+            interface_id=0,
+            device=0,
+            stream_id=0,
+            sequence_data=PvtSequenceData.zero_values(),
+        )
+
+    @staticmethod
+    def from_binary(data_bytes: bytes) -> 'PvtSubmitSequenceDataRequest':
+        """" Deserialize a binary representation of this class. """
+        data = zaber_bson.loads(data_bytes)  # type: Dict[str, Any]
+        return PvtSubmitSequenceDataRequest.from_dict(data)
+
+    def to_binary(self) -> bytes:
+        """" Serialize this class to a binary representation. """
+        self.validate()
+        return zaber_bson.dumps(self.to_dict())  # type: ignore
+
+    def to_dict(self) -> Dict[str, Any]:
+        return {
+            'interfaceId': int(self.interface_id),
+            'device': int(self.device),
+            'streamId': int(self.stream_id),
+            'sequenceData': self.sequence_data.to_dict(),
+        }
+
+    @staticmethod
+    def from_dict(data: Dict[str, Any]) -> 'PvtSubmitSequenceDataRequest':
+        return PvtSubmitSequenceDataRequest(
+            interface_id=data.get('interfaceId'),  # type: ignore
+            device=data.get('device'),  # type: ignore
+            stream_id=data.get('streamId'),  # type: ignore
+            sequence_data=PvtSequenceData.from_dict(data.get('sequenceData')),  # type: ignore
+        )
+
+    def validate(self) -> None:
+        """" Validates the properties of the instance. """
+        if self.interface_id is None:
+            raise ValueError(f'Property "InterfaceId" of "PvtSubmitSequenceDataRequest" is None.')
+
+        if not isinstance(self.interface_id, (int, float, decimal.Decimal)):
+            raise ValueError(f'Property "InterfaceId" of "PvtSubmitSequenceDataRequest" is not a number.')
+
+        if int(self.interface_id) != self.interface_id:
+            raise ValueError(f'Property "InterfaceId" of "PvtSubmitSequenceDataRequest" is not integer value.')
+
+        if self.device is None:
+            raise ValueError(f'Property "Device" of "PvtSubmitSequenceDataRequest" is None.')
+
+        if not isinstance(self.device, (int, float, decimal.Decimal)):
+            raise ValueError(f'Property "Device" of "PvtSubmitSequenceDataRequest" is not a number.')
+
+        if int(self.device) != self.device:
+            raise ValueError(f'Property "Device" of "PvtSubmitSequenceDataRequest" is not integer value.')
+
+        if self.stream_id is None:
+            raise ValueError(f'Property "StreamId" of "PvtSubmitSequenceDataRequest" is None.')
+
+        if not isinstance(self.stream_id, (int, float, decimal.Decimal)):
+            raise ValueError(f'Property "StreamId" of "PvtSubmitSequenceDataRequest" is not a number.')
+
+        if int(self.stream_id) != self.stream_id:
+            raise ValueError(f'Property "StreamId" of "PvtSubmitSequenceDataRequest" is not integer value.')
+
+        if self.sequence_data is None:
+            raise ValueError(f'Property "SequenceData" of "PvtSubmitSequenceDataRequest" is None.')
+
+        if not isinstance(self.sequence_data, PvtSequenceData):
+            raise ValueError(f'Property "SequenceData" of "PvtSubmitSequenceDataRequest" is not an instance of "PvtSequenceData".')
+
+        self.sequence_data.validate()

zaber_motion/library.py

@@ -171,7 +171,7 @@ class Library:
         """
         request = dto.CheckVersionRequest(
             host="py",
-            version="7.11.0",
+            version="7.12.0",
         )
         call_sync("library/check_version", request)
 

zaber_motion/microscopy/microscope.py

@@ -28,6 +28,8 @@ class Microscope:
         """
         return self._connection
 
+    _illuminator: Optional[Illuminator]
+
     @property
     def illuminator(self) -> Optional[Illuminator]:
         """
@@ -35,6 +37,8 @@ class Microscope:
         """
         return self._illuminator
 
+    _focus_axis: Optional[Axis]
+
     @property
     def focus_axis(self) -> Optional[Axis]:
         """
@@ -42,6 +46,8 @@ class Microscope:
         """
         return self._focus_axis
 
+    _x_axis: Optional[Axis]
+
     @property
     def x_axis(self) -> Optional[Axis]:
         """
@@ -49,6 +55,8 @@ class Microscope:
         """
         return self._x_axis
 
+    _y_axis: Optional[Axis]
+
     @property
     def y_axis(self) -> Optional[Axis]:
         """
@@ -56,6 +64,8 @@ class Microscope:
         """
         return self._y_axis
 
+    _plate: Optional[AxisGroup]
+
     @property
     def plate(self) -> Optional[AxisGroup]:
         """
@@ -63,6 +73,8 @@ class Microscope:
         """
         return self._plate
 
+    _objective_changer: Optional[ObjectiveChanger]
+
     @property
     def objective_changer(self) -> Optional[ObjectiveChanger]:
         """
@@ -70,6 +82,8 @@ class Microscope:
         """
         return self._objective_changer
 
+    _filter_changer: Optional[FilterChanger]
+
     @property
     def filter_changer(self) -> Optional[FilterChanger]:
         """
@@ -77,6 +91,8 @@ class Microscope:
         """
         return self._filter_changer
 
+    _autofocus: Optional[Autofocus]
+
     @property
     def autofocus(self) -> Optional[Autofocus]:
         """
@@ -84,6 +100,8 @@ class Microscope:
         """
         return self._autofocus
 
+    _camera_trigger: Optional[CameraTrigger]
+
     @property
     def camera_trigger(self) -> Optional[CameraTrigger]:
         """
@@ -98,31 +116,7 @@ class Microscope:
         """
         self._connection: Connection = connection
         self._config: MicroscopeConfig = MicroscopeConfig.from_binary(MicroscopeConfig.to_binary(config))
-        self._illuminator: Optional[Illuminator] = Illuminator(Device(connection, config.illuminator))\
-            if config.illuminator else None
-        self._focus_axis: Optional[Axis] = Axis(Device(connection, config.focus_axis.device), config.focus_axis.axis)\
-            if config.focus_axis and config.focus_axis.device else None
-        self._x_axis: Optional[Axis] = Axis(Device(connection, config.x_axis.device), config.x_axis.axis)\
-            if config.x_axis and config.x_axis.device else None
-        self._y_axis: Optional[Axis] = Axis(Device(connection, config.y_axis.device), config.y_axis.axis)\
-            if config.y_axis and config.y_axis.device else None
-        self._plate: Optional[AxisGroup] = AxisGroup([self._x_axis, self._y_axis])\
-            if self._x_axis is not None and self._y_axis is not None else None
-        self._objective_changer: Optional[ObjectiveChanger] = ObjectiveChanger(
-            Device(connection, config.objective_changer),
-            self._focus_axis)\
-            if config.objective_changer and self._focus_axis else None
-        self._filter_changer: Optional[FilterChanger] = FilterChanger(Device(connection, config.filter_changer))\
-            if config.filter_changer else None
-        self._autofocus: Optional[Autofocus] = Autofocus(
-            config.autofocus,
-            self._focus_axis,
-            self._objective_changer.turret if self._objective_changer else None)\
-            if config.autofocus and self._focus_axis else None
-        self._camera_trigger: Optional[CameraTrigger] = CameraTrigger(
-            Device(connection, config.camera_trigger.device),
-            config.camera_trigger.channel)\
-            if config.camera_trigger and config.camera_trigger.device else None
+        self._initialize_components()
 
     @staticmethod
     def find(
@@ -266,3 +260,56 @@ class Microscope:
             request,
             dto.StringResponse.from_binary)
         return response.value
+
+    def _initialize_components(self) -> None:
+        """
+        Initializes the components of the microscope based on the configuration.
+        """
+        if self._config.illuminator:
+            self._illuminator = Illuminator(Device(self._connection, self._config.illuminator))
+        else:
+            self._illuminator = None
+
+        if self._config.focus_axis and self._config.focus_axis.device:
+            self._focus_axis = Axis(
+                Device(self._connection, self._config.focus_axis.device), self._config.focus_axis.axis)
+        else:
+            self._focus_axis = None
+
+        if self._config.x_axis and self._config.x_axis.device:
+            self._x_axis = Axis(Device(self._connection, self._config.x_axis.device), self._config.x_axis.axis)
+        else:
+            self._x_axis = None
+
+        if self._config.y_axis and self._config.y_axis.device:
+            self._y_axis = Axis(Device(self._connection, self._config.y_axis.device), self._config.y_axis.axis)
+        else:
+            self._y_axis = None
+
+        if self._x_axis is not None and self._y_axis is not None:
+            self._plate = AxisGroup([self._x_axis, self._y_axis])
+        else:
+            self._plate = None
+
+        if self._config.objective_changer and self._focus_axis:
+            self._objective_changer = ObjectiveChanger(
+                Device(self._connection, self._config.objective_changer), self._focus_axis)
+        else:
+            self._objective_changer = None
+
+        if self._config.filter_changer:
+            self._filter_changer = FilterChanger(Device(self._connection, self._config.filter_changer))
+        else:
+            self._filter_changer = None
+
+        if self._config.autofocus and self._focus_axis:
+            turret = self._objective_changer.turret if self._objective_changer else None
+            self._autofocus = Autofocus(self._config.autofocus, self._focus_axis, turret)
+        else:
+            self._autofocus = None
+
+        if self._config.camera_trigger and self._config.camera_trigger.device:
+            trigger_device = Device(self._connection, self._config.camera_trigger.device)
+            self._camera_trigger = CameraTrigger(trigger_device, self._config.camera_trigger.channel)
+        else:
+            self._camera_trigger = None

zaber_motion/version.py

@@ -1 +1 @@
-__version__ = "7.11.0"
+__version__ = "7.12.0"

{zaber_motion-7.11.0.dist-info → zaber_motion-7.12.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zaber_motion
-Version: 7.11.0
+Version: 7.12.0
 Summary: An official library for communicating with Zaber devices.
 Author-email: "Zaber Technologies Inc." <contact@zaber.com>
 License: The MIT License (MIT)

{zaber_motion-7.11.0.dist-info → zaber_motion-7.12.0.dist-info}/RECORD

@@ -9,18 +9,18 @@ zaber_motion/call.py,sha256=lH72duqcNvzh3Mae5JYZ5kIsyMRftSxSCgmWk9TjYik,5206
 zaber_motion/convert_exception.py,sha256=TZrdGkmaTR7QOAwoxIQ9sOkHtuVg1bVs-sxbEDn22V8,8487
 zaber_motion/dto_object.py,sha256=3gJU6AQCjiZcx2o7p2C9VTqw9apOM0i21ssmAM-VmEY,359
 zaber_motion/events.py,sha256=3Ebp8zEjlRSjKG-b3WVrncZ6juHlKJTNeL-oeYIGpuk,3398
-zaber_motion/library.py,sha256=DoMQ7i5ZFxHJq8R6919xzrL1lqyqedI9P5J4XNgl6Gk,5497
+zaber_motion/library.py,sha256=cxJ49Rrt7g_3CitoLQxdB9kfJq6zBBkkHuQO96Ahx7o,5497
 zaber_motion/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zaber_motion/serialization.py,sha256=Fm53Bd_oAZ7yaTjtBss23Dps3ynWv8wUJT5JVQyqKVs,987
 zaber_motion/tools.py,sha256=O9IGJNGaaG7Sz2jGkexdJfgyJ5L4vsLXJKFUhZlKlCI,2213
 zaber_motion/unit_table.py,sha256=FV-6VegAm499BJBJ4tdXgkP2Hl2h-fIlLJWkMrHlPAM,2497
 zaber_motion/units.py,sha256=RCkeTZwhZFJg2hffBJFweAhDHLHZOkLUPel0e1Wzi3g,10853
-zaber_motion/version.py,sha256=x9MCn4dCG1RFCLIu1cexyXZxTu8pEkj0bwIVzIIVoxY,23
+zaber_motion/version.py,sha256=epZfTrsMWfpY2no1bS7o-MeQ23JncNk7yI5RH-5Pqlg,23
 zaber_motion/ascii/__init__.py,sha256=hB91yrB-iTGuk270V97TQK09fMiMUwL3FEIKhLqMJfc,4848
 zaber_motion/ascii/all_axes.py,sha256=ZdeufI6s3Yxtf9S0FbCZQNklKqFXIEEEbLE2-ITuASA,10793
 zaber_motion/ascii/axis.py,sha256=nd1gy84lnKxaEktTEtBvCF6DVsfdfds6dflQJ1P9XCI,57670
 zaber_motion/ascii/axis_group.py,sha256=dmITE1fLE919oIWnuf-ft-sM2-9CN0dZ13j3NUGqpyU,12939
-zaber_motion/ascii/axis_settings.py,sha256=dg1F08b0E4RC7fGZI4Gn6nq0BeUz8g2TruvIok_KFOg,23481
+zaber_motion/ascii/axis_settings.py,sha256=FAIHOOc4EgYjfNuxoJ43nPVmodJx9UOFu70QbG60B5w,23501
 zaber_motion/ascii/connection.py,sha256=aaI2d5IIL1XYdWR-L7E-GscQHKz3O8h107um9XB31tk,38497
 zaber_motion/ascii/device.py,sha256=HjNmrqJe1wCCEzfZEKl8Owp1Qitox8eUTPdt85pQrPA,29740
 zaber_motion/ascii/device_io.py,sha256=T0uZsSGk5OdLkb2ZRFxmHP9jHtzZb85J21J80FFAKYo,39388
@@ -29,9 +29,9 @@ zaber_motion/ascii/lockstep.py,sha256=ijO3foMhQmh5i9DeydK7Gpr-DK-Vz2wKVS472j7Qa6
 zaber_motion/ascii/oscilloscope.py,sha256=QGIIDiSdMy1Lqqmeu_UpWJakxxjzVbG6BAHHIroE0mg,20316
 zaber_motion/ascii/oscilloscope_data.py,sha256=Y2Qv9uuLnGix7SEnPAlQUkzwSgm-krPqGVLoMzyHBCA,7230
 zaber_motion/ascii/pvt.py,sha256=WMfbmJlJAm-eEPJxUPNlpOXYyzuJPBFeeDo2bCfoATE,2875
-zaber_motion/ascii/pvt_buffer.py,sha256=XClBbo593Y10Q2B0a1xe1TPqKwnCQp5DhIkyqNK07vU,3180
+zaber_motion/ascii/pvt_buffer.py,sha256=kJd8UyQ2oYtT3zSNU4InmhxU0F8SL5KBqyJuHVMmd_o,4450
 zaber_motion/ascii/pvt_io.py,sha256=mRNokeYvZmqZul5M27n5i38shpv129hmqjdeiSKfNwo,22252
-zaber_motion/ascii/pvt_sequence.py,sha256=zitbIQQGGKafI_HeEB61d1ICIMDBQx0PvjgeyUUfGHM,51461
+zaber_motion/ascii/pvt_sequence.py,sha256=pUSJhqEKOY-yU0R4sDbWWfNDuqD84Ex3SMzhujN8br4,57761
 zaber_motion/ascii/servo_tuner.py,sha256=AryjPcrBqQ9xSk2INuIPAFIjxN-HmqUBCrWYmvNpezs,23345
 zaber_motion/ascii/setting_constants.py,sha256=ztScMyFkFec1F9zLvmmD4jysXDFXE5dfHF3uByPqnkw,29929
 zaber_motion/ascii/storage.py,sha256=tJEpxUdOn7qfE1UGbEmwuoB864K5HHjQe6tTwG5tbkE,26149
@@ -153,7 +153,7 @@ zaber_motion/dto/product/__init__.py,sha256=M7m313pDn0mT99u1qPhrmit0N3wN3D3ylnIQ
 zaber_motion/dto/product/process_controller_mode.py,sha256=JSfKRAOKGWBXpKbUAvYy3IDGtWyRoz4c5sXKXpiHu_4,228
 zaber_motion/dto/product/process_controller_source.py,sha256=yz3yRp5AZP71bYB7ivY9q3ZuGIZkJ7hxt13G-XpPFyc,2577
 zaber_motion/dto/product/process_controller_source_sensor.py,sha256=z2nfX4jq79cAmnbr7Wz9GKKa1CoSZfEFakHgqfKpJoM,217
-zaber_motion/dto/requests/__init__.py,sha256=sqgxbzP1x0_kzjzDertiagx_sCmJAIHN2BgNbvoxIzk,23380
+zaber_motion/dto/requests/__init__.py,sha256=CmIL7bEKTyXAykNsi0WSSgiI5K53xuIXdBqdNEHIlcY,23736
 zaber_motion/dto/requests/alert_event_wrapper.py,sha256=Mev5LIbaksLReCI3VrlNA3_B7xWjQU5mcm0sLjRmzt4,3053
 zaber_motion/dto/requests/autofocus_focus_request.py,sha256=3rZ5-s6dc6BV_DukDa-Fi2BL30QKAOd-K_9dP-QWOZ0,5272
 zaber_motion/dto/requests/autofocus_get_objective_params_request.py,sha256=0E0X4PuQVJ8Yt3LZzUC-nueGFQ-mEMpcSRUzf5ta6mw,5351
@@ -295,13 +295,16 @@ zaber_motion/dto/requests/oscilloscope_request.py,sha256=-60420N1ASklLt4cXiJja43
 zaber_motion/dto/requests/oscilloscope_start_request.py,sha256=6VFGTeuq0Ej6AC2GEh4-nYD5D-48Um32WC1YEP6YzLw,3132
 zaber_motion/dto/requests/prepare_command_request.py,sha256=msIbcbIl9wd3txrYiU2d4JM3t8rx-6DQbY9e985IAvM,4445
 zaber_motion/dto/requests/process_on.py,sha256=6GgTZUAOljage_Bu1vv_1tpeTeLVDUlM0f1Edm_RKw8,3807
+zaber_motion/dto/requests/pvt_buffer_get_sequence_data_request.py,sha256=Z4dKCCSPX9HFq6yBXMdltw6Ovd91I7ryMtfsEr2fiKw,3179
 zaber_motion/dto/requests/pvt_csv_request.py,sha256=YjFTHsHWnfm3tDOXfVP75VSiC2167jd9wJ663qd7CRY,2142
 zaber_motion/dto/requests/pvt_generate_positions_request.py,sha256=UzujVEAqL-fQMNJQrpusIMuefuDcC23WkuCCFOrrjv8,3177
+zaber_motion/dto/requests/pvt_generate_velocities_and_times_request.py,sha256=ALRhjYZhfaruC2T9tFAKMvFxZvJv9Ft_tq3K5zr3ZAM,4593
 zaber_motion/dto/requests/pvt_generate_velocities_request.py,sha256=MFIgb_kdh_vYJGBhEqCxZPYZGvAsc6D_rWf7nQ5R_0I,4362
 zaber_motion/dto/requests/pvt_load_csv_request.py,sha256=1LalBGodyuWCXcFeBdcgF4RflQ9BN2JT_4yXEeIPUwY,1468
 zaber_motion/dto/requests/pvt_point_request.py,sha256=xOltyiyRN4hdtRB-tzLuyLoLs2SDmPW5neO7sI4bGtM,6142
 zaber_motion/dto/requests/pvt_points_request.py,sha256=C-hYdDv43b3dLA5RSwOkFFDxnSeU1s_CpL0FL3kM8Ok,6324
 zaber_motion/dto/requests/pvt_save_csv_request.py,sha256=s0NLHeaCuA1o6nCSt8swOvad-Kt_Bs0cr_R4icG9aBc,3046
+zaber_motion/dto/requests/pvt_submit_sequence_data_request.py,sha256=uFaceNDeV9v_SAVcyGlQ49UyqBzyqoEvjdaKbd3fhB0,3867
 zaber_motion/dto/requests/renumber_request.py,sha256=jQbw_Q1Z2YWDyLDypDKE2b44KV9Mkm_iS34ZldnD-R0,2902
 zaber_motion/dto/requests/response_type.py,sha256=7tUcqtyLPtnVkr7A6jIs0A3aVcRkyQD0F3woHT_wzgE,125
 zaber_motion/dto/requests/servo_tuning_paramset_response.py,sha256=N7WG013uQoTb0DHgBMjjqhktq_cddNfhBBVNNmMcBcs,1890
@@ -477,15 +480,15 @@ zaber_motion/microscopy/camera_trigger.py,sha256=5Hq-5lfNzVF5-H5r5EvH9ZU2IVa7Ilj
 zaber_motion/microscopy/filter_changer.py,sha256=UPo-YxqUcBxCzA5gKV0UMK2kCJksO24qczFSl5UtiwA,4659
 zaber_motion/microscopy/illuminator.py,sha256=1_Rwc9oQp82MzqbACbRMGHWZvzhfHyvUbip5xvClunI,4169
 zaber_motion/microscopy/illuminator_channel.py,sha256=8qOMB_X17wGB5JYYhumcy7VtGCeE9iGb4SZKOT_VJtE,20514
-zaber_motion/microscopy/microscope.py,sha256=R_sS8iyZWnrFH9Tf0hh37a5w4oKAM3WQjmm8Qy_V2D8,8861
+zaber_motion/microscopy/microscope.py,sha256=NtjCkfhTZsiBvF2a7GDbQnx1volvmyelhVBdMbZuSx4,9781
 zaber_motion/microscopy/objective_changer.py,sha256=sgz6XmM75wOxmyLrM0tfwH2ek4VoGvaX0K53azMVCjM,13557
 zaber_motion/microscopy/wdi_autofocus_provider.py,sha256=fAMVVlfzpB0IpnDikj_sWFbQ5eNCSAJ_jX1ky8FXgtg,11495
 zaber_motion/product/__init__.py,sha256=lno0C-gLBsHNPGnjp6bbXHX0cEk27cA8uFjq5vzmE9Q,531
 zaber_motion/product/process.py,sha256=RGDxS_kyb-66RJ5bWmRtamp0zARPigcwN-zVcVtl7MQ,27527
 zaber_motion/product/process_controller.py,sha256=RQ1rXrdvslqB-3UIXLfLD3D5vfr1xfT8B5jOmTXf-V0,4193
-zaber_motion_bindings/zaber-motion-core-windows-amd64.dll,sha256=ByBuzOT4QicSJU9bZCbqHzEvZowV0qnNQp1-pi3GBhU,15677952
-zaber_motion-7.11.0.dist-info/LICENSE.txt,sha256=xNj9QcKqsI3WK5EBPeYbQAiDcnVe4xmIpCy65NYNVhA,109244
-zaber_motion-7.11.0.dist-info/METADATA,sha256=NU9vH9Ci6ca_IvxigQiMDoxOM2z5azQXgO0nCwxUyn0,129816
-zaber_motion-7.11.0.dist-info/WHEEL,sha256=EsfqhE0qd6WfVs85_gPJMVnnwjseveFUmeew0JBezok,97
-zaber_motion-7.11.0.dist-info/top_level.txt,sha256=ypgkPvPad6Oge50CT6unnvxCEliKUB6olL6CUUER1SA,51
-zaber_motion-7.11.0.dist-info/RECORD,,
+zaber_motion_bindings/zaber-motion-core-windows-amd64.dll,sha256=bHacwVxvvuJ9iK_mPvkV6gJnbb8u3muJK0RmHN8Kk7w,15840256
+zaber_motion-7.12.0.dist-info/LICENSE.txt,sha256=xNj9QcKqsI3WK5EBPeYbQAiDcnVe4xmIpCy65NYNVhA,109244
+zaber_motion-7.12.0.dist-info/METADATA,sha256=caW5r6YnwkceL9tAO9NjPFoQMBmCyf3VSJGCym8AQN0,129816
+zaber_motion-7.12.0.dist-info/WHEEL,sha256=EsfqhE0qd6WfVs85_gPJMVnnwjseveFUmeew0JBezok,97
+zaber_motion-7.12.0.dist-info/top_level.txt,sha256=ypgkPvPad6Oge50CT6unnvxCEliKUB6olL6CUUER1SA,51
+zaber_motion-7.12.0.dist-info/RECORD,,