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
1a664c2b
Commit
1a664c2b
authored
Dec 29, 2014
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed obsolete data output
parent
82208513
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
141 additions
and
97 deletions
+141
-97
Aberration_Calibration.java
src/main/java/Aberration_Calibration.java
+129
-92
LensAdjustment.java
src/main/java/LensAdjustment.java
+12
-5
No files found.
src/main/java/Aberration_Calibration.java
View file @
1a664c2b
This diff is collapsed.
Click to expand it.
src/main/java/LensAdjustment.java
View file @
1a664c2b
...
...
@@ -231,9 +231,9 @@ public class LensAdjustment {
public
String
comment
=
"no comments"
;
// Comment to add to the results
public
int
lensSerialLength
=
4
;
public
String
lensSerial
=
""
;
// Lens serial number
public
boolean
askLensSerial
=
true
;
// Ask lens serial on camera power cycle
public
boolean
askLensSerial
=
true
;
// Ask lens serial on camera power cycle
public
double
reportTemperature
=
50
;
// temperature to report focal length
public
boolean
showLegacy
=
false
;
// Show old focusing parameters (most are not supported anyway)
public
boolean
includeLensSerial
=
true
;
// add lens serial to config filename
public
double
centerDeltaX
=
0.0
;
// required X-difference between lens center and sensor center
public
double
centerDeltaY
=
0.0
;
// required Y-difference between lens center and sensor center
...
...
@@ -606,7 +606,8 @@ public class LensAdjustment {
boolean
cameraIsConfigured
,
int
[]
motorPos
,
double
[]
ampsSeconds
,
// cumulative Amps*seconds (read only, but will be saved/restored)
double
reportTemperature
// temperature to report focal length
double
reportTemperature
,
// temperature to report focal length
boolean
showLegacy
){
this
.
gridGeometryFile
=
gridGeometryFile
;
this
.
initialCalibrationFile
=
initialCalibrationFile
;
...
...
@@ -763,7 +764,7 @@ public class LensAdjustment {
this
.
motorPos
=
motorPos
;
this
.
ampsSeconds
=
ampsSeconds
;
// cumulative Amps*seconds (read only, but will be saved/restored)
this
.
reportTemperature
=
reportTemperature
;
this
.
showLegacy
=
showLegacy
;
}
public
FocusMeasurementParameters
clone
(){
return
new
FocusMeasurementParameters
(
...
...
@@ -921,7 +922,8 @@ public class LensAdjustment {
this
.
cameraIsConfigured
,
this
.
motorPos
,
this
.
ampsSeconds
,
// cumulative Amps*seconds (read only, but will be saved/restored)
this
.
reportTemperature
this
.
reportTemperature
,
this
.
showLegacy
);
}
public
void
setProperties
(
String
prefix
,
Properties
properties
){
...
...
@@ -1092,6 +1094,7 @@ public class LensAdjustment {
for
(
int
i
=
0
;
i
<
this
.
ampsSeconds
.
length
;
i
++)
properties
.
setProperty
(
prefix
+
"ampsSeconds_"
+
i
,
this
.
ampsSeconds
[
i
]+
""
);
properties
.
setProperty
(
prefix
+
"reportTemperature"
,
this
.
reportTemperature
+
""
);
properties
.
setProperty
(
prefix
+
"showLegacy"
,
this
.
showLegacy
+
""
);
}
public
void
getProperties
(
String
prefix
,
Properties
properties
){
if
(
properties
.
getProperty
(
prefix
+
"gridGeometryFile"
)!=
null
)
...
...
@@ -1427,6 +1430,8 @@ public class LensAdjustment {
this
.
ampsSeconds
[
i
]=
Double
.
parseDouble
(
properties
.
getProperty
(
prefix
+
"ampsSeconds_"
+
i
));
if
(
properties
.
getProperty
(
prefix
+
"reportTemperature"
)!=
null
)
this
.
reportTemperature
=
Double
.
parseDouble
(
properties
.
getProperty
(
prefix
+
"reportTemperature"
));
if
(
properties
.
getProperty
(
prefix
+
"showLegacy"
)!=
null
)
this
.
showLegacy
=
Boolean
.
parseBoolean
(
properties
.
getProperty
(
prefix
+
"showLegacy"
));
}
public
boolean
getLensSerial
(){
while
(
true
)
{
// loop until OK-ed
...
...
@@ -1696,6 +1701,7 @@ public class LensAdjustment {
gd
.
addMessage
(
"-----"
);
gd
.
addNumericField
(
"Report focal length at this temperature"
,
this
.
reportTemperature
,
1
,
5
,
"C"
);
gd
.
addCheckbox
(
"Show legacy focusing parameters (most are already not supported anyway)"
,
this
.
showLegacy
);
if
(!
Double
.
isNaN
(
this
.
sensorTemperature
))
gd
.
addMessage
(
"Last measured sensor temperature is "
+
this
.
sensorTemperature
+
" C"
);
...
...
@@ -1888,6 +1894,7 @@ public class LensAdjustment {
this
.
postUVscrewSensitivity
[
i
]=
gd
.
getNextNumber
();
}
this
.
reportTemperature
=
gd
.
getNextNumber
();
this
.
showLegacy
=
gd
.
getNextBoolean
();
return
true
;
}
/* ======================================================================== */
...
...
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