Skip to content

I
imagej-elphel
Commit d4ce4ae9 authored by Andrey Filippov's avatar Andrey Filippov
Browse files
Options

Bug fix - hysteresis was not applied

parent c9f2789f
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
src/main/java/Aberration_Calibration.java
View file @ d4ce4ae9
...@@ -9631,7 +9631,7 @@ if (MORE_BUTTONS) { ...@@ -9631,7 +9631,7 @@ if (MORE_BUTTONS) {
scanPos[1]=centerMotorPos[1]-delta; scanPos[1]=centerMotorPos[1]-delta;
scanPos[2]=centerMotorPos[2]+delta; scanPos[2]=centerMotorPos[2]+delta;
if (debugLevel>0) System.out.println("Scanning tilt in X direction, step#"+(numStep+1)+" (of "+ if (debugLevel>0) System.out.println("Scanning tilt in X direction, step#"+(numStep+1)+" (of "+
(focusMeasurementParameters.scanTiltStepsX-1)+") at "+ IJ.d2s(0.000000001*(System.nanoTime()-startTime),3)); focusMeasurementParameters.scanTiltStepsX+") at "+ IJ.d2s(0.000000001*(System.nanoTime()-startTime),3));
allOK &=moveAndMaybeProbe( allOK &=moveAndMaybeProbe(
true, true,
scanPos, // null OK scanPos, // null OK
...@@ -9671,7 +9671,7 @@ if (MORE_BUTTONS) { ...@@ -9671,7 +9671,7 @@ if (MORE_BUTTONS) {
scanPos[1]=centerMotorPos[1]-delta; scanPos[1]=centerMotorPos[1]-delta;
scanPos[2]=centerMotorPos[2]+0; scanPos[2]=centerMotorPos[2]+0;
if (debugLevel>0) System.out.println("Scanning tilt in Y direction, step#"+(numStep+1)+" (of "+ if (debugLevel>0) System.out.println("Scanning tilt in Y direction, step#"+(numStep+1)+" (of "+
(focusMeasurementParameters.scanTiltStepsY-1)+") at "+ IJ.d2s(0.000000001*(System.nanoTime()-startTime),3)); focusMeasurementParameters.scanTiltStepsY+") at "+ IJ.d2s(0.000000001*(System.nanoTime()-startTime),3));
allOK &=moveAndMaybeProbe( allOK &=moveAndMaybeProbe(
true, true,
scanPos, // null OK scanPos, // null OK
...@@ -10238,7 +10238,7 @@ if (MORE_BUTTONS) { ...@@ -10238,7 +10238,7 @@ if (MORE_BUTTONS) {
0.0, //double sleep, 0.0, //double sleep,
true, //boolean showStatus, true, //boolean showStatus,
"", //String message, "", //String message,
false); //focusMeasurementParameters.compensateHysteresis); //boolean hysteresis) !noHysteresis); //false); //focusMeasurementParameters.compensateHysteresis); //boolean hysteresis)
focusMeasurementParameters.sensorTemperature=camerasInterface.getSensorTemperature(0,focusMeasurementParameters.EEPROM_channel); focusMeasurementParameters.sensorTemperature=camerasInterface.getSensorTemperature(0,focusMeasurementParameters.EEPROM_channel);
ImagePlus imp= camerasInterface.acquireSingleImage ( ImagePlus imp= camerasInterface.acquireSingleImage (
false, //boolean useLasers, false, //boolean useLasers,
......
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