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
81b73514
Commit
81b73514
authored
Sep 18, 2014
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Debugging
parent
46292639
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
2 deletions
+19
-2
Aberration_Calibration.java
src/main/java/Aberration_Calibration.java
+4
-0
FocusingField.java
src/main/java/FocusingField.java
+15
-2
No files found.
src/main/java/Aberration_Calibration.java
View file @
81b73514
...
...
@@ -3865,6 +3865,10 @@ if (MORE_BUTTONS) {
IJ
.
showMessage
(
"LENS_DISTORTION_PARAMETERS is not set"
);
return
;
}
// CLear histories anyway
MOTORS
.
clearPreFocus
();
MOTORS
.
clearHistory
();
int
mode
=
autoMove
?
(
FOCUS_MEASUREMENT_PARAMETERS
.
confirmFirstAuto
?
2
:
3
):
1
;
// not to forget to reset history after forcusing lens by thread
if
(
autoMove
)
MOTORS
.
clearPreFocus
();
...
...
src/main/java/FocusingField.java
View file @
81b73514
...
...
@@ -4900,12 +4900,25 @@ public boolean LevenbergMarquardt(
result
[
1
]=
zTilts
[
1
]-
this
.
qualBOptimizationResults
[
1
];
result
[
2
]=
zTilts
[
2
]-
this
.
qualBOptimizationResults
[
2
];
double
[]
zm
=
null
;
if
(
parallelMove
){
//
if (parallelMove){
zm
=
new
double
[
3
];
for
(
int
i
=
0
;
i
<
zm
.
length
;
i
++)
zm
[
i
]=
fieldFitting
.
mechanicalFocusingModel
.
mToZm
(
measurement
.
motors
[
i
],
i
);
// }
if
(
this
.
debugLevel
>
0
){
System
.
out
.
println
(
"Current linearized motor positions:"
);
for
(
int
i
=
0
;
i
<
zm
.
length
;
i
++)
{
System
.
out
.
println
(
i
+
": "
+
zm
[
i
]+
" um"
);
}
System
.
out
.
println
(
"Checking back to motor positions:"
);
double
[]
rzm
=
new
double
[
3
];
for
(
int
i
=
0
;
i
<
zm
.
length
;
i
++)
zm
[
i
]=
fieldFitting
.
mechanicalFocusingModel
.
zmToM
(
zm
[
i
],
i
);
for
(
int
i
=
0
;
i
<
zm
.
length
;
i
++)
{
System
.
out
.
println
(
i
+
": "
+
rzm
[
i
]+
" um (was "
+
measurement
.
motors
[
i
]);
}
}
double
[]
dm
=
getAdjustedMotors
(
zm
,
parallelMove
?
zm:
null
,
targetRelFocalShift
+
this
.
qualBOptimizationResults
[
0
]
,
//targetRelFocalShift+best_qb_corr[0],
this
.
qualBOptimizationResults
[
1
],
//0.0, // targetTiltX, // for testing, normally should be 0 um/mm
this
.
qualBOptimizationResults
[
2
],
//0.0, // targetTiltY,
...
...
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