[wip] docs / minor variable names

parent fe27cd47
2018/07/13 10:20:30 ==========================================
#define PCO_SDK_LIN_VERSION "$Id: PCOSDK_LIN [pcoDev.1.1.14] $"
#define PCO_SDK_WIN_VERSION "$Id: PCOSDK_WIN [1.20] $"
#define PCO_LIMA_VERSION "$Id: PCOLIMA [1.7.7] $"
#define PCO_GIT_VERSION "$Id: PCO rev[2018-07-12 14:47:34 +0200] head[fe27cd4][fe27cd47b3d69fae33d7e4b32c3a6096a0a988f4] ref[ (HEAD -> master, gitrh/master, gitlab/master, github/master, github/HEAD)] at [2018/07/13 10:20:28] $"
#define LIMA_GIT_VERSION "$Id: LIMA rev[2018-05-23 12:18:49 +0200] head[31a027d1][31a027d1269c578dcfd371ed39fb2ab50672bd41] ref[ (HEAD -> core-1.7, tag: pco-1.7.7, gitlab/core-1.7, github/core-1.7)] at [2018/07/13 10:20:28] $"
#define PROCLIB_GIT_VERSION "$Id: PROCLIB rev[2018-01-12 12:04:00 +0100] head[8175ab6][8175ab6cef2b729d69449e2845483df01262ee04] ref[ (HEAD)] at [2018/07/13 10:20:28] $"
#define LIBCONFIG_GIT_VERSION "$Id: LIBCONFIG rev[2013-02-07 18:08:29 +0100] head[89c411a][89c411a541d4ab4d66257ccb85749853fd685cbb] ref[ (HEAD, github/master, github/HEAD, master)] at [2018/07/13 10:20:28] $"
#define TANGO_GIT_VERSION "$Id: TANGO rev[2018-05-23 11:04:34 +0200] head[c209ba6][c209ba61ce1dfa3c9038543909978fc89082d365] ref[ (HEAD -> core-1.7, gitlab/core-1.7, github/core-1.7)] at [2018/07/13 10:20:28] $"
#define SPEC_GIT_VERSION "$Id: SPEC rev[2018-02-20 19:16:00 +0100] head[043e98c][043e98cdab4c87a0e61dc0c89b46008785d13bf8] ref[ (HEAD -> master, github/master, github/HEAD)] at [2018/07/13 10:20:28] $"
2018/06/19 09:52:35 ==========================================
scp: copied local directory to segfs and /tmp_14_days:
from: [../../install/] and [./bat/]
......
......@@ -4,6 +4,91 @@
#===================================================
#===================================================
#===================================================
# 2018/04/24 / RecorderForcedFifo
# requested by Solei
#===================================================
- with RAMCAM family, make and acq with more frames than allowed
the memory size
void Camera::setRecorderForcedFifo(int val) ;
void Camera::getRecorderForcedFifo(int &val) ;
when this special mode is set the cam the live mode is set
and the nr of img is set (Nr > maxNrImgInBuffer)
live mode -> assign buffer 1rst img = last img = 0
"last img acquired"
NOTE:
- if the readout time is higher than the acq time
some img will be lost
sdk return the LAST image acquired
implemented in
int BufferCtrlObj::_xferImag()
procedure:
- set recorderForcedFifo to 1
- set the nr of images (Nr > maxNrImgInBuffer)
- make the acq at frame rate not higer than allowed by the readout
tested by Solei OK
#===================================================
# 2016/01/20 / implement a trig start sequence in pco-dimax
#
# https://jira.esrf.fr/browse/SID27-67
# https://jira.esrf.fr/browse/SID19-169
#===================================================
pco / properties
params trigSingleMulti=1
-> m_extTrigSingle_eq_Multi
case ExtTrigSingle:
trig (at ACQ ENABLE) starts a sequence of int trigger (dimax only)
the cam is acquiring with int trigger in ring buffer
when cam receive a trig at ACQ ENABLE, it continues
acquiring images and STOP after N images
the last N images saved in the ram, can retrive from 1 .. N
// StorageMode 0 - record mode
// RecorderSubmode 1 - ring buffer
// Triggermode 0 - auto
// Acquiremode 0 - auto / ignored
=== prepareAcq
// ------- set Record Stop Event (used for dimax for ExtTrigSingle)
if(_isCameraType(Dimax)) {
if((trig_mode == ExtTrigSingle) && (iRequestedFrames > 0)) {
wRecordStopEventMode = 0x0002; // record stop by edge at the <acq. enbl.>
dwRecordStopDelayImages = iRequestedFrames;
_pco_SetRecordStopEvent(wRecordStopEventMode, dwRecordStopDelayImages, error);
}
}
if(_isCameraType(Dimax | Pco4k | Pco2k)) {
if((trig_mode == ExtTrigSingle) && (iRequestedFrames > 0))
{
mode = RecRing;
}
=== startAcq
if((iRequestedFrames > 0 ) && (forcedFifo == 0) ){
if((trig_mode == ExtTrigSingle) ) {
_beginthread( _pco_acq_thread_dimax_trig_single, 0, (void*) this);
=== checkTrigMode
switch(trig_mode){
case ExtTrigSingle:
if ((m_cam->_isCameraType(Dimax)) || m_extTrigSingle_eq_Multi) return true ;
break;
#===================================================
#========= 2017/09/22 / lima patch for buff realloc
#===================================================
......
......@@ -782,8 +782,9 @@ namespace lima
int m_pco_buffer_nrevents;
bool bRecorderForcedFifo;
int iRecorderStopRequest;
bool m_bRecorderForcedFifo;
int m_iRecorderStopRequest;
int m_iPcoAcqMode;
//----------------------------------
......
......@@ -849,32 +849,9 @@ int BufferCtrlObj::_xferImag()
FALSE, // wait for any object
msTimeout); // ms wait timeout
//GetPendingBuffer(hCamera, &ipending);// <--- This can indicate that more than one buffer is ready
// If this returns 3 in ipending, everyting is fine and you keep the pace.
#if 0
switch (eventRet) {
case WAIT_OBJECT_0 + 0:
printf("--- WAIT_OBJECT_0 + 0 / event[%d]\n", eventRet);
break;
case WAIT_OBJECT_0 + 1:
printf("--- WAIT_OBJECT_0 + 1 / event[%d]\n", eventRet);
break;
case WAIT_OBJECT_0 + 2:
printf("--- WAIT_OBJECT_0 + 2 / event[%d]\n", eventRet);
break;
case WAIT_OBJECT_0 + 3:
printf("--- WAIT_OBJECT_0 + 3 / event[%d]\n", eventRet);
break;
case WAIT_TIMEOUT:
printf("--- WAIT_TIMEOUT / event[%d]\n", eventRet);
break;
default:
printf("--- DEFAULT / event[%d]\n", eventRet);
break;
}
#endif
if((eventRet >= eventMin) && (eventRet <= eventMax))
{
if(dbgTraceFifo)
......@@ -892,7 +869,6 @@ int BufferCtrlObj::_xferImag()
if ((errPco != 0) || (dwStatusDrv != 0))
{
char msg[256];
__sprintfSExt(msg, sizeof(msg),
"err[0x%lx] dwStatusDll[0x%lx] dwStatusDrv[0x%lx] \n"
"sBufNr[%d] WAITOBJ[%d] dwFrameIdx[%d] iLoopsPolled[%d] msTimeout[%d]\n",
......@@ -914,10 +890,6 @@ int BufferCtrlObj::_xferImag()
printf("---TRACE iLoopsPolled[%d] dwStatusDll[0x%lx] sBufNr[%d] dwFrameIdx[%d]\n", iLoopsPolled, dwStatusDll, sBufNr, dwFrameIdx);
}
// -----------------------------------------------------------------------------------------
// ---------------------------------- sBufNr was fired
// -----------------------------------------------------------------------------------------
......
......@@ -872,14 +872,14 @@ void Camera::setRecorderForcedFifo(int val)
{
DEB_MEMBER_FUNCT();
bRecorderForcedFifo = !! val;
m_bRecorderForcedFifo = !! val;
}
void Camera::getRecorderForcedFifo(int &val)
{
DEB_MEMBER_FUNCT();
val = bRecorderForcedFifo;
val = m_bRecorderForcedFifo;
}
//====================================================================
......@@ -938,7 +938,7 @@ void Camera::getRecorderStopRequest(int &val)
int Camera::_getRecorderStopRequest()
{
DEB_MEMBER_FUNCT();
return iRecorderStopRequest;
return m_iRecorderStopRequest;
}
......@@ -946,7 +946,7 @@ int Camera::_setRecorderStopRequest(int val)
{
DEB_MEMBER_FUNCT();
return (iRecorderStopRequest = val);
return (m_iRecorderStopRequest = val);
}
//====================================================================
......
......@@ -32,7 +32,8 @@ Camera::Camera(const std::string& camPar) :
m_handle(NULL),
m_Roi_lastFixed_time(0),
m_pco_buffer_nrevents(PCO_BUFFER_NREVENTS),
bRecorderForcedFifo(false)
m_iPcoAcqMode(0),
m_bRecorderForcedFifo(false)
{
DEF_FNID;
DEB_CONSTRUCTOR();
......
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