Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
imagej-elphel
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
3
Issues
3
List
Board
Labels
Milestones
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Elphel
imagej-elphel
Commits
fc1edb4d
Commit
fc1edb4d
authored
Jul 19, 2014
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Before implementing modifications to the approximation function
parent
ee11a47a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
1 deletion
+16
-1
FocusingField.java
src/main/java/FocusingField.java
+16
-1
No files found.
src/main/java/FocusingField.java
View file @
fc1edb4d
...
@@ -264,7 +264,7 @@ public class FocusingField {
...
@@ -264,7 +264,7 @@ public class FocusingField {
public
void
setProperties
(
String
prefix
,
Properties
properties
){
public
void
setProperties
(
String
prefix
,
Properties
properties
){
if
(
debugLevel
>
1
)
System
.
out
.
println
(
"FocusingField: setProperties()"
);
if
(
debugLevel
>
1
)
System
.
out
.
println
(
"FocusingField: setProperties()"
);
if
(
fieldFitting
==
null
)
{
if
(
fieldFitting
==
null
)
{
System
.
out
.
println
(
"fieldFitting is not initi
o
alized, nothing to save"
);
System
.
out
.
println
(
"fieldFitting is not initialized, nothing to save"
);
return
;
return
;
}
}
...
@@ -5372,6 +5372,21 @@ ln_a - ar[1]
...
@@ -5372,6 +5372,21 @@ ln_a - ar[1]
ln_r0 - ar[2]
ln_r0 - ar[2]
k - ar[3]
k - ar[3]
ar1 - ar[4]
ar1 - ar[4]
=================
f(x)=sqrt((ax)^2+r^2)+kx-f_corr
f(z)=sqrt((a*(z-z_corr)^2+r^2)+k*(z-z_corr)-f_corr
f'(x)=0 -> x=sqrt(1/r^2-a^2)
z_corr=(kx*rc/a)/*sqrt(a^2-kx^2)
f_corr=sqrt((a*(z-z_corr)^2+r^2)+k*(z-z_corr) - sqrt((a*(z)^2+r^2)
f_corr=sqrt((a*z_corr)^2+r_eff^2)-kx*(z_corr) – r_eff
k=a*func(tilt]), func(-inf)=-1, func(0)=0, func(+inf)=1
k=2/pi*atan(tilt);
d_k/d_tilt = 2/pi*(1/tilt^2)
x=z_in-(z0+z_corr)
Ideally I should match second derivative near minimum to isolate tilt from ar[3] - adjust r_eff and then shift
Maybe not, just keep iot as it is (matching f" at minimum while tilting will cause a sharp turn nearby)
*/
*/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment