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
996dd2fd
Commit
996dd2fd
authored
Sep 13, 2014
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fixes after testing actual adjustment
parent
7c4c6c01
Changes
2
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
260 additions
and
27 deletions
+260
-27
Aberration_Calibration.java
src/main/java/Aberration_Calibration.java
+5
-7
FocusingField.java
src/main/java/FocusingField.java
+255
-20
No files found.
src/main/java/Aberration_Calibration.java
View file @
996dd2fd
...
...
@@ -4084,7 +4084,7 @@ if (MORE_BUTTONS) {
this
.
SYNC_COMMAND
.
stopRequested
);
FOCUSING_FIELD
.
setDebugLevel
(
DEBUG_LEVEL
);
FOCUSING_FIELD
.
setAdjustMode
(
false
);
if
(
PROPERTIES
!=
null
)
FOCUSING_FIELD
.
getProperties
(
"FOCUSING_FIELD."
,
PROPERTIES
);
if
(
PROPERTIES
!=
null
)
FOCUSING_FIELD
.
getProperties
(
"FOCUSING_FIELD."
,
PROPERTIES
,
true
);
MOTORS
.
addCurrentHistoryToFocusingField
(
FOCUSING_FIELD
);
System
.
out
.
println
(
"Saving measurement history to "
+
path
);
FOCUSING_FIELD
.
saveXML
(
path
);
...
...
@@ -4424,7 +4424,7 @@ if (MORE_BUTTONS) {
this
.
SYNC_COMMAND
.
stopRequested
);
FOCUSING_FIELD
.
setDebugLevel
(
DEBUG_LEVEL
);
FOCUSING_FIELD
.
setAdjustMode
(
false
);
if
(
PROPERTIES
!=
null
)
FOCUSING_FIELD
.
getProperties
(
"FOCUSING_FIELD."
,
PROPERTIES
);
if
(
PROPERTIES
!=
null
)
FOCUSING_FIELD
.
getProperties
(
"FOCUSING_FIELD."
,
PROPERTIES
,
true
);
// keep distortions center from history
System
.
out
.
println
(
"Loaded FocusingField"
);
if
(!
FOCUSING_FIELD
.
configureDataVector
(
true
,
// boolean silent (maybe add option with false to change number of parameters?)
...
...
@@ -5140,7 +5140,7 @@ if (MORE_BUTTONS) {
this
.
SYNC_COMMAND
.
stopRequested
);
ff
.
setDebugLevel
(
DEBUG_LEVEL
);
ff
.
setAdjustMode
(
false
);
if
(
PROPERTIES
!=
null
)
ff
.
getProperties
(
"FOCUSING_FIELD."
,
PROPERTIES
);
if
(
PROPERTIES
!=
null
)
ff
.
getProperties
(
"FOCUSING_FIELD."
,
PROPERTIES
,
true
);
MOTORS
.
addCurrentHistoryToFocusingField
(
ff
,
(
runs
==
0
)?
0
:(
MOTORS
.
historySize
()-
runs
),
...
...
@@ -5241,7 +5241,7 @@ if (MORE_BUTTONS) {
this
.
SYNC_COMMAND
.
stopRequested
);
ff
.
setDebugLevel
(
DEBUG_LEVEL
);
ff
.
setAdjustMode
(
false
);
if
(
PROPERTIES
!=
null
)
ff
.
getProperties
(
"FOCUSING_FIELD."
,
PROPERTIES
);
if
(
PROPERTIES
!=
null
)
ff
.
getProperties
(
"FOCUSING_FIELD."
,
PROPERTIES
,
true
);
MOTORS
.
addCurrentHistoryToFocusingField
(
ff
);
// all, not just newly acquired
if
(
MASTER_DEBUG_LEVEL
>
0
){
System
.
out
.
println
(
"*** Calculating focal distance shift for each of "
+
MOTORS
.
historySize
()+
" recorded measurments ***"
);
...
...
@@ -13510,11 +13510,9 @@ private double [][] jacobianByJacobian(double [][] jacobian, boolean [] mask) {
MOTORS
.
focusingHistory
.
getProperties
(
"FOCUSING_HISTORY."
,
properties
);
GONIOMETER_PARAMETERS
.
getProperties
(
"GONIOMETER_PARAMETERS."
,
properties
);
ABERRATIONS_PARAMETERS
.
getProperties
(
"ABERRATIONS_PARAMETERS."
,
properties
);
if
(
FOCUSING_FIELD
!=
null
)
FOCUSING_FIELD
.
getProperties
(
"FOCUSING_FIELD."
,
properties
);
if
(
FOCUSING_FIELD
!=
null
)
FOCUSING_FIELD
.
getProperties
(
"FOCUSING_FIELD."
,
properties
,
false
);
// false -> overwrite distortions center
}
private
String
selectSourceDirectory
(
String
defaultPath
)
{
return
CalibrationFileManagement
.
selectDirectory
(
false
,
// save
"Source calibration superdirectory selection (should have 1-1...3-3 subdirectories)"
,
// title
...
...
src/main/java/FocusingField.java
View file @
996dd2fd
This diff is collapsed.
Click to expand it.
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