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
aa3ec45c
Commit
aa3ec45c
authored
May 24, 2019
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixing null lwirReader
parent
ebf39c79
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
Aberration_Calibration.java
...com/elphel/imagej/calibration/Aberration_Calibration.java
+4
-1
Goniometer.java
src/main/java/com/elphel/imagej/calibration/Goniometer.java
+3
-3
No files found.
src/main/java/com/elphel/imagej/calibration/Aberration_Calibration.java
View file @
aa3ec45c
...
...
@@ -9459,7 +9459,10 @@ if (MORE_BUTTONS) {
// CAMERAS.setNumberOfThreads(THREADS_MAX);
// CAMERAS.debugLevel=DEBUG_LEVEL;
if (GONIOMETER==null) {
if ((GONIOMETER==null) || (GONIOMETER.lwirReader == null)) {
if (LWIR_READER == null) {
LWIR_READER = new LwirReader(LWIR_PARAMETERS);
}
GONIOMETER= new Goniometer(
LWIR_READER,
// CAMERAS, // CalibrationHardwareInterface.CamerasInterface cameras,
src/main/java/com/elphel/imagej/calibration/Goniometer.java
View file @
aa3ec45c
...
...
@@ -51,7 +51,7 @@ horizontal axis:
// for
// debugging
public
CalibrationHardwareInterface
.
CamerasInterface
cameras
=
null
;
LwirReader
lwirReader
=
null
;
public
LwirReader
lwirReader
=
null
;
// public CalibrationHardwareInterface.LaserPointers lasers = null;
// public static CalibrationHardwareInterface.FocusingMotors motorsS=null;
// public DistortionProcessConfiguration
...
...
@@ -289,7 +289,7 @@ horizontal axis:
boolean
dirAxial
=
reverseAxial
;
int
numStops
=
0
;
for
(
int
i
=
0
;
i
<
numTiltSteps
;
i
++){
int
tiltIndex
=
zenithToNadir
?(
numTiltSteps
-
i
):
i
;
int
tiltIndex
=
zenithToNadir
?(
numTiltSteps
-
i
-
1
):
i
;
double
tilt
=-(
scanLatitudeLow
+
tiltIndex
*
scanStepTilt
+
0.5
*(
1.0
-
scanOverlapVertical
)*
targetAngleVertical
);
tilts
[
i
]=
tilt
;
double
tiltL
=
tilt
-
0.5
*
targetAngleVertical
;
...
...
@@ -325,7 +325,7 @@ horizontal axis:
}
rots
[
i
]=
new
double
[
numAxialSteps
];
for
(
int
j
=
0
;
j
<
numAxialSteps
;
j
++){
int
axialIndex
=
dirAxial
?(
numAxialSteps
-
j
):
j
;
int
axialIndex
=
dirAxial
?(
numAxialSteps
-
j
-
1
):
j
;
double
axial
=(
scanLimitAxialLow
+
axialIndex
*
scanStep
+
0.5
*(
1.0
-
overlap
)*
targetAngleHorizontal
/
cosMinAbsTilt
);
rots
[
i
][
j
]=
axial
;
}
...
...
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