instamatic-dev
diff --git a/‎docs/app_data/instamatic/config/camera/test.yaml‎
Lines changed: 1 addition & 0 deletions b/‎docs/app_data/instamatic/config/camera/test.yaml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎docs/config.md‎
Lines changed: 3 additions & 0 deletions b/‎docs/config.md‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎docs/gui.md‎
Lines changed: 39 additions & 0 deletions b/‎docs/gui.md‎
Lines changed: 39 additions & 0 deletions
diff --git a/‎docs/images/gui_fast_adt.png‎
113 KB b/‎docs/images/gui_fast_adt.png‎
113 KB
diff --git a/‎src/instamatic/_collections.py‎
Lines changed: 12 additions & 2 deletions b/‎src/instamatic/_collections.py‎
Lines changed: 12 additions & 2 deletions
diff --git a/‎src/instamatic/config/camera/simulate.yaml‎
Lines changed: 1 addition & 0 deletions b/‎src/instamatic/config/camera/simulate.yaml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/instamatic/config/camera/simulateDLL.yaml‎
Lines changed: 1 addition & 0 deletions b/‎src/instamatic/config/camera/simulateDLL.yaml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/instamatic/config/settings.yaml‎
Lines changed: 1 addition & 0 deletions b/‎src/instamatic/config/settings.yaml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/instamatic/experiments/__init__.py‎
Lines changed: 1 addition & 0 deletions b/‎src/instamatic/experiments/__init__.py‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/instamatic/experiments/experiment_base.py‎
Lines changed: 5 additions & 1 deletion b/‎src/instamatic/experiments/experiment_base.py‎
Lines changed: 5 additions & 1 deletion
@@ -8,3 +8,4 @@ interface: simulate
 physical_pixelsize: 0.055
 stretch_amplitude: 2.43
 stretch_azimuth: 83.37
+dead_time: 0.0
@@ -206,6 +206,9 @@ This file holds the specifications of the camera. This file is must be located t
 **interface**
 : Give the interface of the camera interface to connect to, for example: `timepix`/`emmenu`/`simulate`/`gatan`/`merlin`. Leave blank or set to `None` to load the camera specs, but do not load the camera module (this also turns off the videostream gui).
 
+**dead_time**
+: Set the dead time (i.e. the gap between acquisitions) of the detector; if this value (`camera.dead_time`) is not set but required, Instamatic might attempt to use `CalibMovieDelays.dead_time` value calibrated via `instamatic.calibrate_movie_delays` instead. Typically, Instamatic will not run this calibration automatically: the user needs to either set `camera.dead_time` or call `instamatic.calibrate_movie_delays` themselves.
+
 **default_binsize**
 : Set the default binsize, default: `1`.
 
 
@@ -154,6 +154,45 @@ Pressing `Start Collection` will collect a series of frames with the given tilt
 Data are output to `.tiff` and `.mrc`, including input files to read the data in PETS and REDp.
 
 
+## FastADT data collection
+
+Module: `fast_adt`
+
+A generic module used to run cRED experiments where the tracking is done a priori i.e. in a swoop directly preceding the diffraction experiment.
+
+Before the experiment, decide on diffraction and tracking modes to be used. The diffraction can be collected as a series of static `stills` or a `continuous` movie. In the latter case, the rotation speed (upon calibration via `instamatic.calib_stage_rotation`) will be established automatically. If desired, a `manual` crystal tracking path can be also requested. Tracking is done just before the experiment. A series of images with crystal positions at different angles will be collected and user will be requested to point on points to measure and then confirm by clicking on the image stream.
+
+![FastADT pane](images/gui_fast_adt.png)
+
+For optimum performance, the FastADT frame uses three separate TEM setting which need to be preemptively set up by the user. The "Image", "Tracking" and "Diffraction" settings are used when collecting the respective kinds of images. They are saved between microscope sessions.
+
+**Diffraction mode**  
+: `stills` or `continuous`, used to switch between rotation and stills/precession-assisted experiment.
+
+**Diffraction start (deg)**  
+: The tilt series/swipe starting angle in degrees.
+
+**Diffraction stop (deg)**  
+: The tilt series/swipe ending angle in degrees.
+
+**Diffraction step (deg)**  
+: The target spacing between angles at which subsequent diffraction images are collected within the tilt series/swipe in degrees.
+
+**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 step (deg)**
+: The target spacing between angles at which subsequent tracking images are collected within the tracking series in degrees.
+
+**Tracking exposure (s)**
+: The time taken to collect each tracking image in seconds.
+
+The function of config settings' `store` / `restore` buttons has been described above. The `start` button starts the (tracking and then) experiment. Further information and instructions concerning the `fast_adt` experiment may appear in the window and in the console. Collected data is automatically output in all available formats to the target directory at the end of experiment.
+
+
 ## Machine learning
 
 Module: `machine_learning`
 
@@ -1,8 +1,11 @@
 from __future__ import annotations
 
+import contextlib
+import logging
 import string
+import time
 from collections import UserDict
-from typing import Any, Tuple
+from typing import Any, Callable
 
 
 class NoOverwriteDict(UserDict):
@@ -14,14 +17,21 @@ def __setitem__(self, key: Any, value: Any) -> None:
         super().__setitem__(key, value)
 
 
+class NullLogger(logging.Logger):
+    def __init__(self, name='null'):
+        super().__init__(name)
+        self.addHandler(logging.NullHandler())
+        self.propagate = False
+
+
 class PartialFormatter(string.Formatter):
     """`str.format` alternative, allows for partial replacement of {fields}"""
 
     def __init__(self, missing: str = '{{{}}}') -> None:
         super().__init__()
         self.missing: str = missing  # used instead of missing values
 
-    def get_field(self, field_name: str, args, kwargs) -> Tuple[Any, str]:
+    def get_field(self, field_name: str, args, kwargs) -> tuple[Any, str]:
         """When field can't be found, return placeholder text instead."""
         try:
             obj, used_key = super().get_field(field_name, args, kwargs)
 
@@ -18,3 +18,4 @@ physical_pixelsize: 0.055
 possible_binsizes: [1]
 stretch_amplitude: 2.43
 stretch_azimuth: 83.37
+dead_time: 0.0
@@ -16,3 +16,4 @@ interface: simulateDLL
 possible_binsizes: [1, 2, 4]
 stretch_amplitude: 0
 stretch_azimuth: 0
+dead_time: 0.0
@@ -59,6 +59,7 @@ modules:
   - 'cred'
   - 'cred_tvips'
   - 'cred_fei'
+  - 'fast_adt'
   - 'sed'
   - 'autocred'
   - 'red'
 
@@ -3,5 +3,6 @@
 from .autocred import experiment as autocRED
 from .cred import experiment as cRED
 from .cred_tvips import experiment as cRED_tvips
+from .fast_adt import experiment as fast_adt
 from .red import experiment as RED
 from .serialed import experiment as serialED
@@ -9,7 +9,11 @@ class ExperimentBase(ABC):
     """Experiment base class."""
 
     @abstractmethod
-    def start_collection(self):
+    def __init__(self, *args, **kwargs) -> None:
+        pass
+
+    @abstractmethod
+    def start_collection(self, **kwargs):
         pass
 
     def setup(self):