Commit aa3ec45c authored by Andrey Filippov's avatar Andrey Filippov

fixing null lwirReader

parent ebf39c79
...@@ -9459,7 +9459,10 @@ if (MORE_BUTTONS) { ...@@ -9459,7 +9459,10 @@ if (MORE_BUTTONS) {
// CAMERAS.setNumberOfThreads(THREADS_MAX); // CAMERAS.setNumberOfThreads(THREADS_MAX);
// CAMERAS.debugLevel=DEBUG_LEVEL; // 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( GONIOMETER= new Goniometer(
LWIR_READER, LWIR_READER,
// CAMERAS, // CalibrationHardwareInterface.CamerasInterface cameras, // CAMERAS, // CalibrationHardwareInterface.CamerasInterface cameras,
...@@ -51,7 +51,7 @@ horizontal axis: ...@@ -51,7 +51,7 @@ horizontal axis:
// for // for
// debugging // debugging
public CalibrationHardwareInterface.CamerasInterface cameras = null; public CalibrationHardwareInterface.CamerasInterface cameras = null;
LwirReader lwirReader = null; public LwirReader lwirReader = null;
// public CalibrationHardwareInterface.LaserPointers lasers = null; // public CalibrationHardwareInterface.LaserPointers lasers = null;
// public static CalibrationHardwareInterface.FocusingMotors motorsS=null; // public static CalibrationHardwareInterface.FocusingMotors motorsS=null;
// public DistortionProcessConfiguration // public DistortionProcessConfiguration
...@@ -289,7 +289,7 @@ horizontal axis: ...@@ -289,7 +289,7 @@ horizontal axis:
boolean dirAxial=reverseAxial; boolean dirAxial=reverseAxial;
int numStops=0; int numStops=0;
for (int i=0;i<numTiltSteps;i++){ 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); double tilt=-(scanLatitudeLow+tiltIndex*scanStepTilt+ 0.5*(1.0-scanOverlapVertical)*targetAngleVertical);
tilts [i]=tilt; tilts [i]=tilt;
double tiltL=tilt-0.5*targetAngleVertical; double tiltL=tilt-0.5*targetAngleVertical;
...@@ -325,7 +325,7 @@ horizontal axis: ...@@ -325,7 +325,7 @@ horizontal axis:
} }
rots[i]=new double[numAxialSteps]; rots[i]=new double[numAxialSteps];
for (int j=0;j<numAxialSteps;j++){ 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); double axial=(scanLimitAxialLow+axialIndex*scanStep+ 0.5*(1.0-overlap)*targetAngleHorizontal/cosMinAbsTilt);
rots[i][j]=axial; rots[i][j]=axial;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment