Merge branch 'master' of github.com:Elphel/imagej-elphel

src/main/java/Aberration_Calibration.java

@@ -4005,7 +4005,7 @@ if (MORE_BUTTONS) {
 		if       (label.equals("Scan Calib LMA")) {
 			DEBUG_LEVEL=MASTER_DEBUG_LEVEL;
 			checkSerialAndRestore(); // returns true if did not change or was restored
-			if (FOCUS_MEASUREMENT_PARAMETERS.showScanningSetup("Setup scanning parameters for LMA")) return;
+			if (!FOCUS_MEASUREMENT_PARAMETERS.showScanningSetup("Setup scanning parameters for LMA")) return;
 			MOTORS.setHysteresis(FOCUS_MEASUREMENT_PARAMETERS.motorHysteresis);
 			MOTORS.setDebug(FOCUS_MEASUREMENT_PARAMETERS.motorDebug);
 			double[] range= ScanFocusTilt(

src/main/java/LensAdjustment.java

@@ -1376,7 +1376,7 @@ public class LensAdjustment {
     		this.scanTiltRangeY=       (int) gd.getNextNumber();
     		this.scanTiltStepsX=       (int) gd.getNextNumber();
     		this.scanTiltStepsY=       (int) gd.getNextNumber();
-    		this.compensateHysteresis=       gd.getNextBoolean();
+    		this.motorHysteresis=      (int) gd.getNextNumber();
     		return true;  
     	}