Commit c2f086a
Multi-tracking in FastADT experiment (#145)
* Allow server cameras to be streamable by removing precaution checks
* Unify interface, naming between get_microscope/camera(_class)
* Remove unused _init_attr_dict/get_attrs from microscope client/server
* Do not force server-side attributes to be callable, use them first: these 3 lines took ~3h
* EAFP: Allow camera to call functions whether they are registered or not
* EAFP: Allow camera to call unregistered functions - fixes server cameras
* Remove unnecessary print debug statement
* Add **streamable** description to `config.md` documentation
* Encapsulate FastADT paths in separate prop/method
* Add new TrackingArtist to be used with plotting multi-runs
* Working multi-tracking FastADT frame! Still needs polish
* Change `ClickEvent` to dataclass, implement `ClickEvent.xy`
* Optimize clicking logic in FastADT experiment
* Streamline the `calibrate_beamshift_live` function
* Streamline `CalibBeamShift.plot`
* Improvements to `CalibBeamShift` readability (WIP)
* Add option to calibrate beamshift with vsp
* Fix errors, add beam center
* Switch calibration output format from pickle to yaml
* Allow delay during calibrate beamshift
* Add necessary reflections to fix plotting
* Final tweaks
* Make the yaml produced by CalibBeamShift human-readable
* Update src/instamatic/calibrate/calibrate_beamshift.py
Co-authored-by: Stef Smeets <stefsmeets@users.noreply.github.com>
* Update src/instamatic/calibrate/calibrate_beamshift.py
Co-authored-by: Stef Smeets <stefsmeets@users.noreply.github.com>
* Minor post-review type-hint improvements + ruff
* Add `instamatic.utils.iterating` with `sawtooth` iterating function
* Make the `click_dispatcher:ClickEvent.xy` a property
* Rephrase `VideoStreamProcessor.temporary` using `blocked` context
* Fix the bug where canceling FastADT did not remove its elements
* Fix the bug where colors of crystal tracking repeated after 10
* Remove debug message
* Attempt to generalize collecting, revert as needed
* Fix: rotation speed for negative target pace is negative, rounds to 0
* Rename tracking "mode" to "algo"; if continuous, track w/ movie
* Generalize FastADT run collection (+fix resulting bugs)
* Revert change: use stills for continuous tracking
* Minor fixes and code quality improvements
* Clean, remove unused code
* Fix tracking failing for beam not in the center at alignment
* Fix Run.__str__, clean up code, method, call order
* Log all behavior in two separate message windows.
* Fix ignore msg1,2 variables in headless FastADT experiment
* Update in tests `tracking_mode` -> `tracking_algo`
* Add estimated time required dialog in FastADT message 2
* Display which experiment is being collected in multi-expt
* Display which experiment is being collected in multi-expt
* Trace variables only after everything was defined to avoid Exceptions
* Fix: leaving input empty even temporarily caused exception
---------
Co-authored-by: Stef Smeets <stefsmeets@users.noreply.github.com>1 parent 9e0fc8d commit c2f086a
10 files changed
Lines changed: 385 additions & 288 deletions
File tree
- docs
- src/instamatic
- calibrate
- camera
- experiments/fast_adt
- gui
- utils
- tests
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
181 | 181 | | |
182 | 182 | | |
183 | 183 | | |
184 | | - | |
185 | | - | |
| 184 | + | |
| 185 | + | |
186 | 186 | | |
187 | 187 | | |
188 | 188 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
57 | 57 | | |
58 | 58 | | |
59 | 59 | | |
60 | | - | |
| 60 | + | |
61 | 61 | | |
62 | 62 | | |
63 | 63 | | |
64 | 64 | | |
65 | | - | |
| 65 | + | |
66 | 66 | | |
67 | 67 | | |
68 | 68 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
137 | 137 | | |
138 | 138 | | |
139 | 139 | | |
140 | | - | |
| 140 | + | |
141 | 141 | | |
142 | 142 | | |
143 | 143 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
160 | 160 | | |
161 | 161 | | |
162 | 162 | | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
163 | 167 | | |
164 | 168 | | |
165 | 169 | | |
| |||
237 | 241 | | |
238 | 242 | | |
239 | 243 | | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
240 | 255 | | |
241 | 256 | | |
242 | 257 | | |
| |||
0 commit comments