Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
imagej-elphel
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
3
Issues
3
List
Board
Labels
Milestones
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Elphel
imagej-elphel
Commits
adea6f41
Commit
adea6f41
authored
Jan 04, 2015
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fix - removed averaging in temperature scan mode
parent
7799e971
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
9 deletions
+13
-9
Aberration_Calibration.java
src/main/java/Aberration_Calibration.java
+13
-9
No files found.
src/main/java/Aberration_Calibration.java
View file @
adea6f41
...
...
@@ -5942,19 +5942,23 @@ if (MORE_BUTTONS) {
"Average Tilt y: "+IJ.d2s(zcZ0TxTy[0][2],3)+"um/mm\n";
System.out.println(msg);
gd.addMessage(msg);
gd.addCheckbox("Store calculated tilts",FOCUSING_FIELD.updateAverageTilts);
if (modeAverage) {
gd.addCheckbox("Store calculated tilts",FOCUSING_FIELD.updateAverageTilts);
}
}
gd.showDialog();
if (!gd.wasCanceled()){
if (FOCUSING_FIELD.recalculateAverageTilts==1){ // only if recalculated
FOCUSING_FIELD.updateAverageTilts=gd.getNextBoolean();
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.avgTy=zTxTyAbsRel[0][2]; // average absolute tilt Y (optionally used when finding Z of the glued SFE)
FOCUS_MEASUREMENT_PARAMETERS.result_fDistance=ZTM[0];
FOCUS_MEASUREMENT_PARAMETERS.result_tiltX=ZTM[1];
FOCUS_MEASUREMENT_PARAMETERS.result_tiltY=ZTM[2];
}
if (modeAverage && (ZTM!=null) ) { // in temp.scan ZTM==null
FOCUSING_FIELD.updateAverageTilts=gd.getNextBoolean();
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.avgTy=zTxTyAbsRel[0][2]; // average absolute tilt Y (optionally used when finding Z of the glued SFE)
FOCUS_MEASUREMENT_PARAMETERS.result_fDistance=ZTM[0];
FOCUS_MEASUREMENT_PARAMETERS.result_tiltX=ZTM[1];
FOCUS_MEASUREMENT_PARAMETERS.result_tiltY=ZTM[2];
}
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment