Commit 1fc817af authored by Alejandro Homs Puron's avatar Alejandro Homs Puron Committed by bliss administrator
Browse files

Fix issues in IntTrigMult:

* Bug incrementing m_frames_triggered
* Fix Camera and Interface status when Armed
* Remove unnecessary check un Interface::startAcq (improved in CtControl)
parent 17ba1341
......@@ -275,7 +275,7 @@ void Camera::startAcq()
{
CommandReq trigger = m_requests->get_command(Requests::TRIGGER);
m_trigger_state = RUNNING;
m_frames_triggered += m_nb_triggers;
m_frames_triggered += m_nb_images;
bool disarm_at_end = (m_frames_triggered == m_nb_frames);
DEB_TRACE() << "Trigger start: " << DEB_VAR1(disarm_at_end);
......@@ -600,7 +600,7 @@ Camera::Status Camera::_getStatus()
status = Fault;
else if(m_trigger_state == RUNNING)
status = Exposure;
else if(m_armed)
else if(m_armed && (m_frames_triggered == 0))
status = Armed;
else if(m_initialize_state == RUNNING)
status = Initializing;
......
......@@ -131,18 +131,17 @@ void Interface::prepareAcq()
void Interface::startAcq()
{
DEB_MEMBER_FUNCT();
TrigMode trig_mode;
m_cam.getTrigMode(trig_mode);
int nb_trig_frames;
m_cam.getNbTriggeredFrames(nb_trig_frames);
// start data retrieval subsystems only in first call
if (getNbHwAcquiredFrames() == 0) {
if ((trig_mode != IntTrigMult) || (nb_trig_frames == 0)) {
// either we use eiger saving or the raw stream
if(m_saving->isActive())
m_saving->start();
else
m_stream->start();
} else {
TrigMode trig_mode;
m_cam.getTrigMode(trig_mode);
if (trig_mode != IntTrigMult)
DEB_WARNING() << "Unexpected start";
}
m_cam.startAcq();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment