Remove spline smoothing focus #621
Conversation
* Take darks after the coarse focus
* Fix some dark_thumb changes * Use os.path.join
pocs/focuser/focuser.py
Outdated
| @@ -332,7 +302,8 @@ def autofocus(self, | |||
| 'plots': plots, | |||
| 'start_event': None, | |||
| 'finished_event': coarse_event, | |||
| **kwargs}) | |||
| **kwargs} | |||
There was a problem hiding this comment.
FWIW, start_event and finished_event are not params to autofocus(), so it is possible for them to be in **kwargs, which would cause a runtime exception.
There was a problem hiding this comment.
Yeah, the kwargs here is also showing as some kind of linting error in my editor although it doesn't give more information. I'll clean this up a bit.
There was a problem hiding this comment.
Actually, there is nothing in the underlying _autofocus that is using either args or kwargs. I'm going to do some more cleanup.
…e-spline-smoothing-focus
…geable. Would like to split out the plotting and fitting into separate helper methods but am going to leave for now. * All plotting moved to one location. * Figure out `focus_type` string so no `if` logic for logging output. * More cleanup of paths.
|
I was originally just moving things over from #574 but now I've started an actual cleanup. For better or for worse. 😬 |
Codecov Report
@@ Coverage Diff @@
## develop #621 +/- ##
===========================================
+ Coverage 69.26% 69.27% +<.01%
===========================================
Files 65 65
Lines 5698 5696 -2
Branches 807 799 -8
===========================================
- Hits 3947 3946 -1
- Misses 1533 1535 +2
+ Partials 218 215 -3
Continue to review full report at Codecov.
|
* Pull out shared parameters from focus * Rearranged underlying _autofocus params to reflect how focus_parmas is set up (which is a more logical order - doesn't really matter in the end).
pocs/focuser/focuser.py
Outdated
| 'merit_function': merit_function, | ||
| 'merit_function_kwargs': merit_function_kwargs, | ||
| 'mask_dilations': mask_dilations, | ||
| 'spline_smoothing': spline_smoothing, |
There was a problem hiding this comment.
Don't need any of the spline_smoothing arguments any more. They're no longer used.
…e-spline-smoothing-focus
Unfortunately the |
More things pulled out of #547. I'm not entirely sure these should all be separate but it will but they don't seem to be Pyro4 specific.