Skip to content
GitLab
Menu
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-frelon
Commits
5e6d540e
Commit
5e6d540e
authored
Jul 27, 2020
by
Alejandro Homs Puron
Committed by
Laurent Claustre
Mar 25, 2022
Browse files
Fix IntTrigMult: allow new trigger while readout in FTM, deal with NULL PCI CcdStatus
parent
12a0efa6
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/FrelonInterface.cpp
View file @
5e6d540e
...
...
@@ -1010,8 +1010,13 @@ void Interface::getStatus(StatusType& status)
TrigMode
trig_mode
;
m_cam
.
getTrigMode
(
trig_mode
);
if
((
trig_mode
==
IntTrigMult
)
&&
(
status
.
det
==
DetWaitForTrigger
))
status
.
det
=
DetIdle
;
if
(
trig_mode
==
IntTrigMult
)
{
// temporary patch until det status is properly managed in core
if
(
status
.
det
&
DetWaitForTrigger
)
status
.
det
=
DetIdle
;
else
if
(
status
.
det
==
DetIdle
)
status
.
det
=
DetExposure
;
}
DEB_RETURN
()
<<
DEB_VAR1
(
status
);
}
...
...
Write
Preview
Supports
Markdown
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