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
60e0334d
Commit
60e0334d
authored
Sep 15, 2014
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fixes + more verbose output
parent
4e7653fe
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
8 deletions
+19
-8
Aberration_Calibration.java
src/main/java/Aberration_Calibration.java
+1
-1
FocusingField.java
src/main/java/FocusingField.java
+18
-7
No files found.
src/main/java/Aberration_Calibration.java
View file @
60e0334d
...
@@ -774,7 +774,7 @@ if (MORE_BUTTONS) {
...
@@ -774,7 +774,7 @@ if (MORE_BUTTONS) {
}
}
addButton
(
"Lens Center"
,
panelFocusing
,
color_process
);
addButton
(
"Lens Center"
,
panelFocusing
,
color_process
);
// if (MORE_BUTTONS) {
// if (MORE_BUTTONS) {
addButton
(
"Find Grid"
,
panelFocusing
,
color_
lense
s
);
addButton
(
"Find Grid"
,
panelFocusing
,
color_
proces
s
);
// }
// }
addButton
(
"Select WOI"
,
panelFocusing
,
color_lenses
);
addButton
(
"Select WOI"
,
panelFocusing
,
color_lenses
);
addButton
(
"Reset Histories"
,
panelFocusing
,
color_lenses
);
addButton
(
"Reset Histories"
,
panelFocusing
,
color_lenses
);
...
...
src/main/java/FocusingField.java
View file @
60e0334d
...
@@ -4858,6 +4858,13 @@ public boolean LevenbergMarquardt(
...
@@ -4858,6 +4858,13 @@ public boolean LevenbergMarquardt(
boolean
noTiltScan
,
boolean
noTiltScan
,
FocusingFieldMeasurement
measurement
,
FocusingFieldMeasurement
measurement
,
boolean
parallelMove
){
boolean
parallelMove
){
if
(
debugLevel
>
0
)
System
.
out
.
println
(
"Calculating optimal focal/tilt, qualBOptimizeMode="
+
this
.
qualBOptimizeMode
);
testQualB
(
false
);
// optimize qualB, store results in this.qualBOptimizationResults
if
(
debugLevel
>
0
)
{
System
.
out
.
println
(
"Optimal absolute Zc="
+
this
.
qualBOptimizationResults
[
0
]);
System
.
out
.
println
(
"Optimal Tx="
+
this
.
qualBOptimizationResults
[
1
]);
System
.
out
.
println
(
"Optimal Ty="
+
this
.
qualBOptimizationResults
[
2
]);
}
if
(!
testMeasurement
(
if
(!
testMeasurement
(
measurement
,
measurement
,
zMin
,
//+best_qb_corr[0],
zMin
,
//+best_qb_corr[0],
...
@@ -4870,13 +4877,6 @@ public boolean LevenbergMarquardt(
...
@@ -4870,13 +4877,6 @@ public boolean LevenbergMarquardt(
return
null
;
return
null
;
}
}
double
[]
result
=
new
double
[
6
];
double
[]
result
=
new
double
[
6
];
if
(
debugLevel
>
0
)
System
.
out
.
println
(
"Calculating optimal focal/tilt, qualBOptimizeMode="
+
this
.
qualBOptimizeMode
);
testQualB
(
false
);
// optimize qualB, store results in this.qualBOptimizationResults
if
(
debugLevel
>
0
)
{
System
.
out
.
println
(
"Optimal absolute Zc="
+
this
.
qualBOptimizationResults
[
0
]);
System
.
out
.
println
(
"Optimal Tx="
+
this
.
qualBOptimizationResults
[
1
]);
System
.
out
.
println
(
"Optimal Ty="
+
this
.
qualBOptimizationResults
[
2
]);
}
// double [] best_qb_corr= fieldFitting.getBestQualB(
// double [] best_qb_corr= fieldFitting.getBestQualB(
// k_red,
// k_red,
...
@@ -5023,6 +5023,17 @@ public boolean LevenbergMarquardt(
...
@@ -5023,6 +5023,17 @@ public boolean LevenbergMarquardt(
}
}
if
(!
changedEnable
)
{
if
(!
changedEnable
)
{
if
(
debugLevel
>
0
)
System
.
out
.
println
(
"No filter cnange, finished in "
+(
n
+
1
)+
" step"
+((
n
==
0
)?
""
:
"s"
));
if
(
debugLevel
>
0
)
System
.
out
.
println
(
"No filter cnange, finished in "
+(
n
+
1
)+
" step"
+((
n
==
0
)?
""
:
"s"
));
if
(
debugLevel
>
0
)
{
System
.
out
.
println
(
"=== Absolute shift/tilt from the measuremet ==="
);
for
(
int
i
=
0
;
i
<
fieldFitting
.
mechanicalFocusingModel
.
paramValues
.
length
;
i
++){
if
((
fieldFitting
.
mechanicalSelect
==
null
)
||
fieldFitting
.
mechanicalSelect
[
i
]
)
{
System
.
out
.
println
(
fieldFitting
.
mechanicalFocusingModel
.
getDescription
(
i
)+
": "
+
IJ
.
d2s
(
fieldFitting
.
mechanicalFocusingModel
.
paramValues
[
i
],
3
)+
" "
+
fieldFitting
.
mechanicalFocusingModel
.
getUnits
(
i
));
}
}
}
return
true
;
return
true
;
}
else
{
}
else
{
if
((
was2PrevEnable
!=
null
)
&&
(
prevEnable
!=
null
)
&&
(
was2PrevEnable
.
length
==
prevEnable
.
length
)){
if
((
was2PrevEnable
!=
null
)
&&
(
prevEnable
!=
null
)
&&
(
was2PrevEnable
.
length
==
prevEnable
.
length
)){
...
...
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