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
d4ce4ae9
Commit
d4ce4ae9
authored
Jul 08, 2014
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug fix - hysteresis was not applied
parent
c9f2789f
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
Aberration_Calibration.java
src/main/java/Aberration_Calibration.java
+3
-3
No files found.
src/main/java/Aberration_Calibration.java
View file @
d4ce4ae9
...
...
@@ -9631,7 +9631,7 @@ if (MORE_BUTTONS) {
scanPos
[
1
]=
centerMotorPos
[
1
]-
delta
;
scanPos
[
2
]=
centerMotorPos
[
2
]+
delta
;
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
(
true
,
scanPos
,
// null OK
...
...
@@ -9671,7 +9671,7 @@ if (MORE_BUTTONS) {
scanPos
[
1
]=
centerMotorPos
[
1
]-
delta
;
scanPos
[
2
]=
centerMotorPos
[
2
]+
0
;
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
(
true
,
scanPos
,
// null OK
...
...
@@ -10238,7 +10238,7 @@ if (MORE_BUTTONS) {
0.0
,
//double sleep,
true
,
//boolean showStatus,
""
,
//String message,
false
);
//focusMeasurementParameters.compensateHysteresis); //boolean hysteresis)
!
noHysteresis
);
//
false); //focusMeasurementParameters.compensateHysteresis); //boolean hysteresis)
focusMeasurementParameters
.
sensorTemperature
=
camerasInterface
.
getSensorTemperature
(
0
,
focusMeasurementParameters
.
EEPROM_channel
);
ImagePlus
imp
=
camerasInterface
.
acquireSingleImage
(
false
,
//boolean useLasers,
...
...
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