Multi-tracking in FastADT experiment

docs/gui.md

@@ -181,8 +181,8 @@ For optimum performance, the FastADT frame uses three separate TEM setting which
 **Diffraction exposure (s)**  
 : The time taken to collect each diffraction image in seconds. In the `continuous` mode it will additionally dictate the rotation speed.
 
-**Tracking mode**
-: Dictates whether `none` or `manual` tracking is to be performed at the start of the experiment.
+**Tracking algorithm**
+: Dictates whether `none` or `manual` tracking algorithm is to be performed at the start of the experiment to determine pathing.
 
 **Tracking step (deg)**
 : The target spacing between angles at which subsequent tracking images are collected within the tracking series in degrees.

src/instamatic/calibrate/calibrate_beamshift.py

@@ -57,12 +57,12 @@ class CalibBeamShift:
     def __repr__(self):
         return f'CalibBeamShift(transform=\n{self.transform},\n   reference_shift=\n{self.reference_shift},\n   reference_pixel=\n{self.reference_pixel})'
 
-    def beamshift_to_pixelcoord(self, beamshift: Sequence[float, float]) -> Vector2:
+    def beamshift_to_pixelcoord(self, beamshift: Sequence[float]) -> Vector2:
         """Converts from beamshift x,y to pixel coordinates."""
         r_i = np.linalg.inv(self.transform)
         return np.dot(self.reference_shift - np.array(beamshift), r_i) + self.reference_pixel
 
-    def pixelcoord_to_beamshift(self, pixelcoord: Sequence[float, float]) -> Vector2:
+    def pixelcoord_to_beamshift(self, pixelcoord: Sequence[float]) -> Vector2:
         """Converts from pixel coordinates to beamshift x,y."""
         pc = np.array(pixelcoord)
         return self.reference_shift - np.dot(pc - self.reference_pixel, self.transform)

src/instamatic/calibrate/calibrate_stage_rotation.py

@@ -137,7 +137,7 @@ def speed_time_to_span(self, speed: float, time: float) -> float:
 
     def plan_rotation(self, target_pace: float) -> RotationPlan:
         """Given target pace in sec / deg, find nearest pace, speed, delay."""
-        target_speed = self.alpha_pace / target_pace  # exact speed setting needed
+        target_speed = abs(self.alpha_pace / target_pace)  # exact speed setting needed
         nearest_speed = self.speed_options.nearest(target_speed)  # nearest setting
         nearest_pace = self.alpha_pace / nearest_speed  # nearest in sec/deg
         total_delay = self.alpha_windup / nearest_speed + self.delay

src/instamatic/camera/videostream.py

@@ -160,6 +160,10 @@ def unblock(self):
     def blocked(self):
         yield
 
+    @contextmanager
+    def unblocked(self):
+        yield
+
 
 class LiveVideoStream(VideoStream):
     """Handle the continuous stream of incoming data from the ImageGrabber."""
@@ -237,6 +241,17 @@ def blocked(self):
             if not was_set_before:
                 self.grabber.continuousCollectionEvent.clear()
 
+    @contextmanager
+    def unblocked(self):
+        """Clear `continuousCollectionEvent` in the statement scope only."""
+        was_set_before = self.grabber.continuousCollectionEvent.is_set()
+        try:
+            self.grabber.continuousCollectionEvent.clear()
+            yield
+        finally:
+            if was_set_before:
+                self.grabber.continuousCollectionEvent.set()
+
     def show_stream(self):
         from instamatic.gui import videostream_frame