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
tango-ds
DeviceClasses
Acquisition
2D
AGIPD
Commits
cbc990ef
Commit
cbc990ef
authored
May 30, 2016
by
Yuelong Yu
Browse files
fix start acq twice
parent
aa913d78
Changes
1
Hide whitespace changes
Inline
Side-by-side
agipdmaster/AGIPDMaster.cpp
View file @
cbc990ef
...
...
@@ -117,13 +117,13 @@ namespace AGIPDMaster_ns
// Delete device allocated objects
{
omni_mutex_lock
l
(
m_mtxAcq
);
m_bSysExit
=
true
;
}
//
{
//
omni_mutex_lock l(m_mtxAcq);
//
m_bSysExit = true;
//
}
int
*
nRet
;
m_thAcq
->
join
((
void
**
)
&
nRet
);
//
int* nRet;
//
m_thAcq->join((void**)&nRet);
/*----- PROTECTED REGION END -----*/
// AGIPDMaster::delete_device
delete
[]
attr_ADCLatency_read
;
...
...
@@ -268,7 +268,7 @@ namespace AGIPDMaster_ns
}
}
m_thAcq
=
new
AcquisitionThread
(
this
,
m_mtxAcq
);
//
m_thAcq = new AcquisitionThread(this,m_mtxAcq);
set_state
(
Tango
::
OFF
);
/*----- PROTECTED REGION END -----*/
// AGIPDMaster::init_device
...
...
@@ -848,9 +848,11 @@ namespace AGIPDMaster_ns
if
(
lVal
!=-
2
)
*
attr_LatestImageNumber_read
=
lVal
;
// if(*attr_LatestImageNumber_read == *attr_FrameNumbers_read && m_bStartAcq)
// this->stop_acq();
if
(
*
attr_LatestImageNumber_read
==
*
attr_FrameNumbers_read
&&
m_bStartAcq
)
{
m_vobjDP
[
0
]
->
command_inout
(
"StopAcq"
);
m_bStartAcq
=
false
;
}
// Set the attribute value
...
...
@@ -1732,10 +1734,10 @@ namespace AGIPDMaster_ns
}
{
omni_mutex_lock
l
(
m_mtxAcq
);
m_bStartAcq
=
true
;
}
//
{
//
omni_mutex_lock l(m_mtxAcq);
m_bStartAcq
=
true
;
//
}
/*----- PROTECTED REGION END -----*/
// AGIPDMaster::start_acq
}
...
...
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