Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
LimaGroup
Lima-camera-pilatus
Commits
d78f221c
Commit
d78f221c
authored
Mar 23, 2016
by
Sebastien Petitdemange
Browse files
fixes: extra delay removed due to wrong test in internal trigger
parent
82466182
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/PilatusCamera.cpp
View file @
d78f221c
...
...
@@ -1028,11 +1028,11 @@ void Camera::startAcquisition(int image_number)
msg
<<
"exposure "
<<
filename
;
send
(
msg
.
str
());
if
(
m_trigger_mode
!=
Camera
::
INTERNAL_SINGLE
||
m_trigger_mode
!=
Camera
::
INTERNAL_MULTI
)
m_cond
.
wait
(
TIME_OUT
);
if
(
m_pilatus3_threshold_mode
)
{
m_cond
.
wait
(
TIME_OUT
);
if
(
m_pilatus3_threshold_mode
)
if
(
m_trigger_mode
!=
Camera
::
INTERNAL_SINGLE
&&
m_trigger_mode
!=
Camera
::
INTERNAL_MULTI
)
m_cond
.
wait
(
1.
);
// Ugly fix for external synchro
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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