Commit c2cce89
Generalize stage motion calibration to include stage translation (#150)
* 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 <[email protected]>
* Update src/instamatic/calibrate/calibrate_beamshift.py
Co-authored-by: Stef Smeets <[email protected]>
* 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
* Fix: do not define ExperimentalFastADT.q to receive it from parent
* Fix: Add LiveVideoStream, FakeVideoStream to camera init to fix instamatic.camera script
* Fix: properly defined VideoStreamFrame.app as "advertised"
* Move `get_frame/image` from jobs to VideoStreanFrame: to fix it/avoid crashes
* Prevent repeated calls to alpha_wobble from crashing GUI
* Overwriting prevention mechanism was not needed
* Do not overwrite `self.wobble_stop_event` if not putting in queue
* FastADT: Save tracking images to tracking/ directory
* Remove development imports from videostream_processor.py
* Some initial code to be used for stage translation calibration
* Encapsulate, Test, Generalize `FloatOptions` to `NumericDomain`
* Realize calib translation and rotation are basically identical: TODO generalize
* Refactor translation/rotation into two
* Add documentation and hooks, fix interface inconsistency. TODO test
* Split x, y, z axis into separate speeds to be calibrated, improve program args
* Fix and vastly improve plotting compared to previous versions
* Works fine! Added better display, docstring.
* Fixed all mypy warnings but imports + few
* Import Self from typing extensions, not typing
* Fix stage rotation test
* Python typing is truly a somewhat enchanting Lovecraftian nightmare
* Sorry mypy, Span and SpeedN can't be bound by Generic in NamedTuple in python 3.9 & 3.10
* Update typos in docs & docstring
* Fix tecnai bug: set with speed received numpy.floating speed
* Move `native` to a separate file in utils
* Add a simple test for new `instamatic.utils.native`
* Add more details, otherwise more difficult to reach, to pets input
* Add some more examples to the pets prefix
---------
Co-authored-by: Stef Smeets <[email protected]>1 parent 6ad085c commit c2cce89
File tree
14 files changed
+730
-259
lines changed- docs
- src/instamatic
- calibrate
- experiments/fast_adt
- microscope/components
- utils
- tests
- config/calibration
14 files changed
+730
-259
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
256 | 256 | | |
257 | 257 | | |
258 | 258 | | |
259 | | - | |
| 259 | + | |
260 | 260 | | |
261 | | - | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
262 | 274 | | |
263 | 275 | | |
264 | 276 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
31 | | - | |
| 31 | + | |
| 32 | + | |
32 | 33 | | |
33 | 34 | | |
34 | 35 | | |
| |||
180 | 181 | | |
181 | 182 | | |
182 | 183 | | |
183 | | - | |
| 184 | + | |
184 | 185 | | |
185 | 186 | | |
186 | 187 | | |
187 | | - | |
| 188 | + | |
188 | 189 | | |
189 | 190 | | |
190 | 191 | | |
191 | 192 | | |
192 | 193 | | |
193 | 194 | | |
194 | 195 | | |
195 | | - | |
196 | | - | |
| 196 | + | |
| 197 | + | |
197 | 198 | | |
198 | 199 | | |
199 | | - | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
200 | 231 | | |
201 | 232 | | |
202 | 233 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
109 | 109 | | |
110 | 110 | | |
111 | 111 | | |
| 112 | + | |
112 | 113 | | |
113 | 114 | | |
114 | 115 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| 9 | + | |
9 | 10 | | |
10 | 11 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
0 commit comments