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
4fb1b103
Commit
4fb1b103
authored
Jul 08, 2014
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fix in scanning
parent
360900bb
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
Aberration_Calibration.java
src/main/java/Aberration_Calibration.java
+2
-2
No files found.
src/main/java/Aberration_Calibration.java
View file @
4fb1b103
...
@@ -9620,9 +9620,9 @@ if (MORE_BUTTONS) {
...
@@ -9620,9 +9620,9 @@ if (MORE_BUTTONS) {
for
(
int
numStep
=
0
;
numStep
<
focusMeasurementParameters
.
scanTiltStepsX
;
numStep
++){
for
(
int
numStep
=
0
;
numStep
<
focusMeasurementParameters
.
scanTiltStepsX
;
numStep
++){
int
delta
=(
int
)
Math
.
round
(
focusMeasurementParameters
.
scanTiltRangeX
*
int
delta
=(
int
)
Math
.
round
(
focusMeasurementParameters
.
scanTiltRangeX
*
(
1.0
*
numStep
/(
focusMeasurementParameters
.
scanTiltStepsX
-
1
)
-
0.5
));
(
1.0
*
numStep
/(
focusMeasurementParameters
.
scanTiltStepsX
-
1
)
-
0.5
));
scanPos
[
0
]=
centerMotorPos
[
0
]
-
delta
;
scanPos
[
0
]=
centerMotorPos
[
0
]
+
delta
;
scanPos
[
1
]=
centerMotorPos
[
1
]-
delta
;
scanPos
[
1
]=
centerMotorPos
[
1
]-
delta
;
scanPos
[
2
]=
centerMotorPos
[
2
]+
delta
;
scanPos
[
2
]=
centerMotorPos
[
2
]+
0
;
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
-
1
)+
") at "
+
IJ
.
d2s
(
0.000000001
*(
System
.
nanoTime
()-
startTime
),
3
));
allOK
&=
moveAndMaybeProbe
(
allOK
&=
moveAndMaybeProbe
(
...
...
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