Commit adea6f41 authored by Andrey Filippov's avatar Andrey Filippov

bug fix - removed averaging in temperature scan mode

parent 7799e971
...@@ -5942,11 +5942,14 @@ if (MORE_BUTTONS) { ...@@ -5942,11 +5942,14 @@ if (MORE_BUTTONS) {
"Average Tilt y: "+IJ.d2s(zcZ0TxTy[0][2],3)+"um/mm\n"; "Average Tilt y: "+IJ.d2s(zcZ0TxTy[0][2],3)+"um/mm\n";
System.out.println(msg); System.out.println(msg);
gd.addMessage(msg); gd.addMessage(msg);
if (modeAverage) {
gd.addCheckbox("Store calculated tilts",FOCUSING_FIELD.updateAverageTilts); gd.addCheckbox("Store calculated tilts",FOCUSING_FIELD.updateAverageTilts);
} }
}
gd.showDialog(); gd.showDialog();
if (!gd.wasCanceled()){ if (!gd.wasCanceled()){
if (FOCUSING_FIELD.recalculateAverageTilts==1){ // only if recalculated if (FOCUSING_FIELD.recalculateAverageTilts==1){ // only if recalculated
if (modeAverage && (ZTM!=null) ) { // in temp.scan ZTM==null
FOCUSING_FIELD.updateAverageTilts=gd.getNextBoolean(); FOCUSING_FIELD.updateAverageTilts=gd.getNextBoolean();
if (FOCUSING_FIELD.updateAverageTilts){ if (FOCUSING_FIELD.updateAverageTilts){
FOCUSING_FIELD.avgTx=zTxTyAbsRel[0][1]; // average absolute tilt X (optionally used when finding Z of the glued SFE) FOCUSING_FIELD.avgTx=zTxTyAbsRel[0][1]; // average absolute tilt X (optionally used when finding Z of the glued SFE)
...@@ -5958,6 +5961,7 @@ if (MORE_BUTTONS) { ...@@ -5958,6 +5961,7 @@ if (MORE_BUTTONS) {
} }
} }
} }
}
saveCurrentConfig(); saveCurrentConfig();
return; return;
} }
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