Ensure flyback pixels metadata gets recorded to match real hardware.

nionswift_plugin/usim/CameraSimulator.py

@@ -101,5 +101,5 @@ def _get_frame_settings(self, readout_area: Geometry.IntRect, binning_shape: Geo
             if self.instrument.probe_state == "scanning" and hasattr(scan_device, "current_probe_position"):
                 probe_position = scan_device.current_probe_position
             elif self.instrument.probe_state == "parked" and parked_probe_position is not None:
-                    probe_position = parked_probe_position
+                probe_position = parked_probe_position
         return FrameSettings(readout_area, binning_shape, exposure_s, copy.deepcopy(scan_context), probe_position, self.instrument.sample.title)

nionswift_plugin/usim/ScanDevice.py

@@ -222,6 +222,7 @@ def __init__(self, instrument: InstrumentDevice.Instrument):
         self.__frame: typing.Optional[Frame] = None
         self.__frame_number = 0
         self.__is_scanning = False
+        self.__flyback_pixels = 2
         self.on_device_state_changed = None
         self.__frame_parameters = ScanFrameParameters()
         self.flyback_pixels = 2
@@ -424,6 +425,7 @@ def read_partial(self, frame_number: typing.Optional[int], pixels_to_skip: int)
             properties["center_y_nm"] = current_frame.frame_parameters.center_nm[0]
             properties["rotation_deg"] = math.degrees(current_frame.frame_parameters.rotation_rad)
             properties["channel_id"] = channel.channel_id
+            properties["flyback_pixels"] = self.__flyback_pixels
             data_element["properties"] = properties
             data_elements.append(data_element)
 
@@ -498,6 +500,7 @@ def __start_next_frame(self) -> None:
                                                                frame_parameters.fov_size_nm.width / size.width)
         self.__scan_box.external_clock = self.__frame_parameters.external_clock_mode != 0
         self.__is_scanning = True
+        self.__flyback_pixels = self.calculate_flyback_pixels(frame_parameters)
 
     def cancel(self) -> None:
         """Cancel acquisition (immediate)."""