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-eiger
Commits
2f9ded8d
Commit
2f9ded8d
authored
Jan 20, 2020
by
Laurent Claustre
Committed by
Alejandro Homs Puron
Jan 30, 2020
Browse files
First proposition to fix IntTrigMult
parent
813dbd81
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/EigerCamera.cpp
View file @
2f9ded8d
...
...
@@ -864,8 +864,10 @@ void Camera::_acquisition_finished(bool ok)
//First we will disarm
if
(
ok
)
std
::
shared_ptr
<
Requests
::
Command
>
disarm
=
m_requests
->
get_command
(
Requests
::
DISARM
);
if
(
m_trig_mode
!=
IntTrigMult
||
(
m_trig_mode
==
IntTrigMult
&&
m_image_number
==
m_nb_frames
))
std
::
shared_ptr
<
Requests
::
Command
>
disarm
=
m_requests
->
get_command
(
Requests
::
DISARM
);
AutoMutex
lock
(
m_cond
.
mutex
());
m_trigger_state
=
ok
?
IDLE
:
ERROR
;
...
...
src/EigerInterface.cpp
View file @
2f9ded8d
...
...
@@ -145,9 +145,7 @@ void Interface::getStatus(StatusType& status)
{
case
Camera
::
Ready
:
{
if
(
m_stream
->
isRunning
())
status
.
set
(
HwInterface
::
StatusType
::
Readout
);
else
if
(
!
m_stream
->
isRunning
())
{
SavingCtrlObj
::
Status
saving_status
=
m_saving
->
getStatus
();
switch
(
saving_status
)
...
...
@@ -160,6 +158,8 @@ void Interface::getStatus(StatusType& status)
status
.
set
(
HwInterface
::
StatusType
::
Fault
);
break
;
}
}
else
status
.
set
(
HwInterface
::
StatusType
::
Ready
);
}
break
;
...
...
src/EigerStream.cpp
View file @
2f9ded8d
...
...
@@ -429,6 +429,7 @@ void Stream::_run()
}
#endif
continue_flag
=
buffer_mgr
.
newFrameReady
(
frame_info
);
m_cam
.
m_image_number
++
;
if
(
trigger_mode
!=
IntTrig
&&
trigger_mode
!=
IntTrigMult
&&
!--
nb_frames
)
m_cam
.
disarm
();
}
...
...
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