Commit 1d7456a6 authored by Andrey Filippov's avatar Andrey Filippov

modifying debug output

parent b7e92215
...@@ -5198,6 +5198,17 @@ if (MORE_BUTTONS) { ...@@ -5198,6 +5198,17 @@ if (MORE_BUTTONS) {
String path=dFile+Prefs.getFileSeparator()+lensPrefix+CAMERAS.getLastTimestampUnderscored()+ String path=dFile+Prefs.getFileSeparator()+lensPrefix+CAMERAS.getLastTimestampUnderscored()+
(modeAverage?"-summary.csv":"-tempscan.csv"); (modeAverage?"-summary.csv":"-tempscan.csv");
if (MASTER_DEBUG_LEVEL>0) System.out.println ((modeAverage?"Saving averaged measurements to ":"Saving temperature measurement log data to ")+path); if (MASTER_DEBUG_LEVEL>0) System.out.println ((modeAverage?"Saving averaged measurements to ":"Saving temperature measurement log data to ")+path);
int sensorWidth=2992,sensorHeight=1936;
if ((LENS_DISTORTIONS!=null) && (LENS_DISTORTIONS.fittingStrategy!=null) && (LENS_DISTORTIONS.fittingStrategy!=null)&&
(LENS_DISTORTIONS.fittingStrategy.distortionCalibrationData!=null) &&
(LENS_DISTORTIONS.fittingStrategy.distortionCalibrationData.eyesisCameraParameters!=null)){
sensorWidth=LENS_DISTORTIONS.fittingStrategy.distortionCalibrationData.eyesisCameraParameters.sensorWidth;
sensorHeight=LENS_DISTORTIONS.fittingStrategy.distortionCalibrationData.eyesisCameraParameters.sensorHeight;
}
if (FOCUSING_FIELD!=null){
sensorWidth=FOCUSING_FIELD.sensorWidth;
sensorHeight=FOCUSING_FIELD.sensorHeight;
}
MOTORS.listHistory( MOTORS.listHistory(
path, // on screen, path - to csv path, // on screen, path - to csv
FOCUS_MEASUREMENT_PARAMETERS.serialNumber, FOCUS_MEASUREMENT_PARAMETERS.serialNumber,
...@@ -5210,8 +5221,8 @@ if (MORE_BUTTONS) { ...@@ -5210,8 +5221,8 @@ if (MORE_BUTTONS) {
FOCUS_MEASUREMENT_PARAMETERS.lensDistanceWeightK, FOCUS_MEASUREMENT_PARAMETERS.lensDistanceWeightK,
FOCUS_MEASUREMENT_PARAMETERS.lensDistanceWeightY, FOCUS_MEASUREMENT_PARAMETERS.lensDistanceWeightY,
label.equals("Focus Average"), label.equals("Focus Average"),
FOCUS_MEASUREMENT_PARAMETERS.result_PX0-LENS_DISTORTIONS.fittingStrategy.distortionCalibrationData.eyesisCameraParameters.sensorWidth/2, FOCUS_MEASUREMENT_PARAMETERS.result_PX0-sensorWidth/2,
FOCUS_MEASUREMENT_PARAMETERS.result_PY0-LENS_DISTORTIONS.fittingStrategy.distortionCalibrationData.eyesisCameraParameters.sensorHeight/2, FOCUS_MEASUREMENT_PARAMETERS.result_PY0-sensorHeight/2,
FOCUS_MEASUREMENT_PARAMETERS.result_lastKT, FOCUS_MEASUREMENT_PARAMETERS.result_lastKT,
FOCUS_MEASUREMENT_PARAMETERS.result_allHistoryKT FOCUS_MEASUREMENT_PARAMETERS.result_allHistoryKT
); );
......
...@@ -8589,7 +8589,7 @@ f_corr: d_fcorr/d_zcorr=0, other: a, reff, kx -> ar[1], ar[2], ar[3], ar[4] ...@@ -8589,7 +8589,7 @@ f_corr: d_fcorr/d_zcorr=0, other: a, reff, kx -> ar[1], ar[2], ar[3], ar[4]
} }
boolean OK= qualBOptimize.qLevenbergMarquardt( boolean OK= qualBOptimize.qLevenbergMarquardt(
interactive, // boolean openDialog, interactive, // boolean openDialog,
debugLevel+1); debugLevel+(interactive?1:0));
if (OK){ if (OK){
zTxTy=fieldFitting.mechanicalFocusingModel.getZTxTy(); zTxTy=fieldFitting.mechanicalFocusingModel.getZTxTy();
System.out.println("qualBOptimize returned:\n"+ System.out.println("qualBOptimize returned:\n"+
......
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