Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove spline smoothing focus #621

Merged
merged 13 commits into from
Sep 24, 2018
Merged

Remove spline smoothing focus #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
27aab8b
pep8
wtgee Sep 22, 2018
a4cf063
* Removing spline smoothing from focusing
wtgee Sep 22, 2018
31564da
Missed a line
wtgee Sep 22, 2018
e1a21db
Add the spline_smoothing to the focuser autofocus
wtgee Sep 22, 2018
729903f
* Fix import
wtgee Sep 22, 2018
76a4f58
Merge branch 'develop' of https://github.com/panoptes/POCS into remov…
wtgee Sep 22, 2018
f8a2454
Tried to do a big cleanup here to make this method a little more mana…
wtgee Sep 22, 2018
73cbe75
Only take final thumbnail if plotting
wtgee Sep 22, 2018
1b62e21
Merge branch 'develop' of https://github.com/panoptes/POCS into remov…
wtgee Sep 23, 2018
d76bff7
Cleanup of focus
wtgee Sep 23, 2018
c292f96
Strip out the args and kwargs as they are unused.
wtgee Sep 23, 2018
bbda00c
Merge branch 'develop' of https://github.com/panoptes/POCS into remov…
wtgee Sep 24, 2018
705ab69
Removing all `spline_smoothing` parameters
wtgee Sep 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions pocs/camera/camera.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,6 @@ def autofocus(self,
merit_function='vollath_F4',
merit_function_kwargs={},
mask_dilations=None,
spline_smoothing=None,
coarse=False,
plots=True,
blocking=False,
Expand Down Expand Up @@ -334,8 +333,6 @@ def autofocus(self,
keyword arguments for the merit function.
mask_dilations (int, optional): Number of iterations of dilation to perform on the
saturated pixel mask (determine size of masked regions), default 10
spline_smoothing (float, optional): smoothing parameter for the spline fitting to
the autofocus data, 0.0 to 1.0, smaller values mean *less* smoothing, default 0.4
coarse (bool, optional): Whether to begin with coarse focusing,
default False
plots (bool, optional: Whether to write focus plots to images folder,
Expand All @@ -359,7 +356,6 @@ def autofocus(self,
merit_function=merit_function,
merit_function_kwargs=merit_function_kwargs,
mask_dilations=mask_dilations,
spline_smoothing=spline_smoothing,
coarse=coarse,
plots=plots,
blocking=blocking,
Expand Down
Loading