pco-win64-1.407

update setId
update the working test version with usb3 / pco edge gold
- test running version
  comp[2015/12/11 13:17:57] PcoCamera.cpp
  install-2015-12-11_131825
  develop_02, remotes/github/develop_02
  d2f1fe0c 2015-12-11 14:26:34
minor / included camera subtype
- improve traceAcq
- test with pco gold 4.2m usb
parent fba4a367
2016/05/23 17:57:03 ==========================================
scp: copied local directory to segfs and /tmp_14_days:
from: [../../install/]
to: [blissadm@lid00a:/segfs/bliss/projects/LIMA/build/depot_win/win_vc9/pco/install-2016-05-23_175657]
to: [/t/rhoms1/install-2016-05-23_175657]
to: [/t/rhoms1/install-beta]
- included camera subtype
- improve traceAcq
- test with pco gold 4.2m usb
bench limatake .0001 1000
* ... xferTimeTot[24.698 s] xferSpeed[323.913 MB/s][40.4891 fps]
Execution time: 33.67 sec. -> 1000/33.67 = 29.7 fps <--- saving in D
* ... xferTimeTot[24.676 s] xferSpeed[324.202 MB/s][40.5252 fps]
Execution time: 28.15 sec. -> 1000/28.14 = 35.5366 <--- no saving
===
249.RHPCO> limaget edgegold traceAcq
- traceAcq =
* fnId[_pco_acq_thread_edge] nrEvents[4]
* ... fnIdXfer[lima::Pco::BufferCtrlObj::_xferImag]
* msExposure[0.1] msDelay[0]
* ... msLimaExposure[0.1] Pco exposure[100000] base[0]
* ... msLimaDelay[0] Pco delay[0] base[0]
* pcoBin horz[0] vert[0]
* limaRoi xy0[0,0] xy1[2047,2047] size[2048,2048]
* ... pcoRoi x[1,2048] y[1,2048]
* ... imgSize[8388608 B] totSize[8388608000 B][8000 MB]
* nrImgRequested[1000] nrImgAcquired[1000]
* ... nrImgRequested0[0] nrImgRecorded[0] maxImgCount[0]
* limaTriggerMode[IntTrig]
* ... pcoTriggerMode[auto] [0]
* ... pcoAcqMode[acqEnbl_Ignored] [0]
* msStartAcqStart[1615] msStartAcqEnd[1703]
* ... usTicks[8][0.716] (ms) (PCO_GetRecordingState execTime)
* ... usTicks[9][53.583] (ms) (PCO_SetRecordingState execTime)
* ... usTicks[10][0.003] (ms) (PCO_CancelImages execTime)
* msImgCoc[24.6] fps[40.6] msTout[0] msTotal[0]
* ... msRecordLoop[0] msRecord[0] endRecord[]
* ... msXfer[24676] endXfer[2016/05/24 11:49:53]
* ... xferTimeTot[24.676 s] xferSpeed[324.202 MB/s][40.5252 fps]
247.RHPCO> bench limatake .0001 1000 <--- no saving
Execution time: 28.15 sec. -> 1000/28.14 = 35.5366
===
243.RHPCO> limaget edgegold traceAcq - traceAcq =
* fnId[_pco_acq_thread_edge] nrEvents[4]
* ... fnIdXfer[lima::Pco::BufferCtrlObj::_xferImag]
* msExposure[0.1] msDelay[0]
* ... msLimaExposure[0.1] Pco exposure[100000] base[0]
* ... msLimaDelay[0] Pco delay[0] base[0]
* pcoBin horz[0] vert[0]
* limaRoi xy0[0,0] xy1[2047,2047] size[2048,2048]
* ... pcoRoi x[1,2048] y[1,2048]
* ... imgSize[8388608 B] totSize[8388608000 B][8000 MB]
* nrImgRequested[1000] nrImgAcquired[1000]
* ... nrImgRequested0[0] nrImgRecorded[0] maxImgCount[0]
* limaTriggerMode[IntTrig]
* ... pcoTriggerMode[auto] [0]
* ... pcoAcqMode[acqEnbl_Ignored] [0]
* msStartAcqStart[1559] msStartAcqEnd[1644]
* ... usTicks[8][0.742] (ms) (PCO_GetRecordingState execTime)
* ... usTicks[9][53.287] (ms) (PCO_SetRecordingState execTime)
* ... usTicks[10][0.002] (ms) (PCO_CancelImages execTime)
* msImgCoc[24.6] fps[40.6] msTout[0] msTotal[0]
* ... msRecordLoop[0] msRecord[0] endRecord[]
* ... msXfer[24698] endXfer[2016/05/24 11:47:17]
* ... xferTimeTot[24.698 s] xferSpeed[323.913 MB/s][40.4891 fps]
244.RHPCO> bench limatake .0001 1000
LIMA[edgegold] > Saving in D:/test/img_12929.edf [AUTO_FRAME-EDF]
Execution time: 33.67 sec. -> 1000/33.67 = 29.7
===
2016/05/20 19:04:02 ==========================================
#define PCO_SDK_VERSION "$Id: PCOSDK [1.18] $"
#define PCO_GIT_VERSION "$Id: PCO rev[2016-05-20 18:59:30 +0200] head[9b0489e][9b0489e38aad39e3e9f018e90b0a767cc1487523] ref[ (HEAD, gitlab/master, master)] at [2016/05/20 19:04:02] $"
#define LIMA_GIT_VERSION "$Id: LIMA rev[2016-05-19 15:11:55 +0200] head[d0008e7][d0008e7c9e7ff688079bce4ea9ec79531d9b5df2] ref[ (HEAD, origin/core-1.4, core-1.4)] at [2016/05/20 19:04:02] $"
#define PROCLIB_GIT_VERSION "$Id: PROCLIB rev[2016-01-15 15:44:08 +0100] head[3a08863][3a0886386e57a24ced072832d321d2dc43449e0b] ref[ (HEAD, origin/master, origin/HEAD, master)] at [2016/05/20 19:04:02] $"
#define LIBCONFIG_GIT_VERSION "$Id: LIBCONFIG rev[2013-02-07 18:08:29 +0100] head[89c411a][89c411a541d4ab4d66257ccb85749853fd685cbb] ref[ (HEAD, origin/master, origin/HEAD, master)] at [2016/05/20 19:04:02] $"
#define TANGO_GIT_VERSION "$Id: TANGO rev[2016-05-19 15:39:42 +0200] head[6028c8b][6028c8b626280ee8d6841b3362536e4cee7246b7] ref[ (HEAD, github/master, github/HEAD, master)] at [2016/05/20 19:04:02] $"
#define SPEC_GIT_VERSION "$Id: SPEC rev[2016-05-19 13:58:33 +0200] head[a5b9be5][a5b9be5efd7916a28cf0ab06fcc6f17e19194605] ref[ (HEAD, origin/master, origin/HEAD, master)] at [2016/05/20 19:04:02] $"
2016/05/20 15:56:54 ==========================================
scp: copied local directory to segfs and /tmp_14_days:
from: [../../install/]
to: [blissadm@lid00a:/segfs/bliss/projects/LIMA/build/depot_win/win_vc9/pco/install-2016-05-20_155648]
to: [/t/rhoms1/install-2016-05-20_155648]
to: [/t/rhoms1/install-beta]
#===================================================
# update to master the working test version with usb3 / pco edge gold
- test running version
comp[2015/12/11 13:17:57] file[2015/12/11 13:16:45] [..\..\..\..\src\PcoCamera.cpp]
install-2015-12-11_131825
Branches: develop_02, remotes/github/develop_02
d2f1fe0cd12ab1c3433d6960bd73c7e1078865e7
2015-12-11 14:26:34
2016/05/19 16:22:25 ==========================================
scp: copied local directory to segfs and /tmp_14_days:
from: [../../install/]
to: [blissadm@lid00a:/segfs/bliss/projects/LIMA/build/depot_win/win_vc9/pco/install-2016-05-19_162219]
to: [/t/rhoms1/install-2016-05-19_162219]
to: [/t/rhoms1/install-beta]
2016/05/19 15:58:06 ==========================================
#define PCO_SDK_VERSION "$Id: PCOSDK [1.18] $"
#define PCO_GIT_VERSION "$Id: PCO rev[2016-04-21 14:23:19 +0200] head[a782449][a782449dcd24a849c8e6d3a6db80b4b3df8dc4f8] ref[ (HEAD, tag: pco-win64-1.406, gitlab/master, github/master, github/HEAD, master)] at [2016/05/19 15:58:06] $"
#define LIMA_GIT_VERSION "$Id: LIMA rev[2016-05-19 15:11:55 +0200] head[d0008e7][d0008e7c9e7ff688079bce4ea9ec79531d9b5df2] ref[ (HEAD, origin/core-1.4, core-1.4)] at [2016/05/19 15:58:06] $"
#define PROCLIB_GIT_VERSION "$Id: PROCLIB rev[2016-01-15 15:44:08 +0100] head[3a08863][3a0886386e57a24ced072832d321d2dc43449e0b] ref[ (HEAD, origin/master, origin/HEAD, master)] at [2016/05/19 15:58:06] $"
#define LIBCONFIG_GIT_VERSION "$Id: LIBCONFIG rev[2013-02-07 18:08:29 +0100] head[89c411a][89c411a541d4ab4d66257ccb85749853fd685cbb] ref[ (HEAD, origin/master, origin/HEAD, master)] at [2016/05/19 15:58:06] $"
#define TANGO_GIT_VERSION "$Id: TANGO rev[2016-05-19 15:39:42 +0200] head[6028c8b][6028c8b626280ee8d6841b3362536e4cee7246b7] ref[ (HEAD, github/master, github/HEAD, master)] at [2016/05/19 15:58:06] $"
#define SPEC_GIT_VERSION "$Id: SPEC rev[2016-05-19 13:58:33 +0200] head[a5b9be5][a5b9be5efd7916a28cf0ab06fcc6f17e19194605] ref[ (HEAD, origin/master, origin/HEAD, master)] at [2016/05/19 15:58:06] $"
- used for pco-win64-1.406
2016/05/19 14:23:26 ==========================================
scp: copied local directory to segfs and /tmp_14_days:
......
......@@ -4,6 +4,18 @@
#===================================================
#===================================================
#===================================================
# 2016/05/20
# update the working test version with usb3 / pco edge gold
#===================================================
- test running version
comp[2015/12/11 13:17:57] file[2015/12/11 13:16:45] [..\..\..\..\src\PcoCamera.cpp]
install-2015-12-11_131825
Branches: develop_02, remotes/github/develop_02
d2f1fe0cd12ab1c3433d6960bd73c7e1078865e7
2015-12-11 14:26:34
#===================================================
......
......@@ -53,6 +53,7 @@
#define ERR_SIZE 256
#define ERRMSG_SIZE (256+128)
#define MODEL_TYPE_SIZE 32
#define MODEL_SUBTYPE_SIZE 32
#define INTERFACE_TYPE_SIZE 32
#define CAMERA_NAME_SIZE 128
#define MSG_SIZE 512
......
......@@ -188,7 +188,10 @@ struct stcPcoData {
DWORD dwPixelRateMax;
char model[MODEL_TYPE_SIZE+1], iface[INTERFACE_TYPE_SIZE+1];
char model[MODEL_TYPE_SIZE+1];
char modelSubType[MODEL_TYPE_SIZE+1];
char iface[INTERFACE_TYPE_SIZE+1];
//int interface_type;
PCO_SC2_CL_TRANSFER_PARAM clTransferParam;
......@@ -249,6 +252,21 @@ struct stcPcoData {
time_t endXferTimestamp;
char *fnId;
char *fnIdXfer;
char *sPcoStorageRecorderMode;
int iPcoStorageMode, iPcoRecorderSubmode;
int iPcoBinHorz, iPcoBinVert;
int iPcoRoiX0, iPcoRoiX1, iPcoRoiY0, iPcoRoiY1;
char *sPcoTriggerMode;
char *sLimaTriggerMode;
int iPcoTriggerMode;
char *sPcoAcqMode;
int iPcoAcqMode;
double dLimaExposure, dLimaDelay;
int iPcoExposure, iPcoExposureBase;
int iPcoDelay, iPcoDelayBase;
char msg[LEN_TRACEACQ_MSG+1];
} traceAcq;
......@@ -317,6 +335,9 @@ enum enumPcoStorageMode {
};
enum enumTblXlatCode2Str {
ModelType, InterfaceType, ModelSubType
};
struct stcBinning {
enumChange changed; /* have values been changed ? */
......@@ -384,7 +405,6 @@ namespace lima
char *_pcoSet_RecordingState(int state, int &error);
int dumpRecordedImages(int &nrImages, int &error);
WORD _getCameraType() {return m_pcoData->stcPcoCamType.wCamType ; }
bool _isCameraType(int tp);
bool _isConfig(){return m_config; };
void _pco_set_shutter_rolling_edge(int &error);
......@@ -432,7 +452,7 @@ namespace lima
char *_pco_SetTriggerMode_SetAcquireMode(int &error);
char *_pco_SetStorageMode_SetRecorderSubmode(enumPcoStorageMode, int &error);
int _pco_GetStorageMode_GetRecorderSubmode();
char *_pco_SetDelayExposureTime(int &error, int ph);
char *_pco_SetDelayExposureTime(int &error);
char *_pco_SetCamLinkSetImageParameters(int &error);
char *_pco_GetCameraType(int &error);
char *_pco_GetTemperatureInfo(int &error);
......@@ -481,8 +501,19 @@ namespace lima
int _pco_SetBitAlignment(int alignment);
char *_checkLogFiles(bool firstCall = false);
char *_camInfo(char *ptr, char *ptrMax, long long int flag);
WORD _getInterfaceType();
char *_getInterfaceTypePtr();
const char *_getInterfaceTypeStr();
WORD _getCameraType();
const char *_getCameraTypeStr();
WORD _getCameraSubType() ;
const char *_getCameraSubTypeStr();
DWORD _getCameraSerialNumber() ;
char *_xlatPcoCode2Str(int code, enumTblXlatCode2Str table, int &err);
};
}
......
......@@ -19,7 +19,7 @@ PCOREV=`git log -n 1 --date=iso --format=format:"rev[%ad] head[%h][%H] ref[%d]"
LIMAREV=`cd ../.. ; git log -n 1 --date=iso --format=format:"rev[%ad] head[%h][%H] ref[%d]" HEAD || echo "ERROR"`
PROCLIBREV=`cd ../../third-party/Processlib ; git log -n 1 --date=iso --format=format:"rev[%ad] head[%h][%H] ref[%d]" HEAD || echo "ERROR"`
LIBCONFIGREV=`cd ../../third-party/libconfig ; git log -n 1 --date=iso --format=format:"rev[%ad] head[%h][%H] ref[%d]" HEAD || echo "ERROR"`
TANGOREV=`cd ../../applications/tango ; git log -n 1 --date=iso --format=format:"rev[%ad] head[%h][%H] ref[%d]" HEAD || echo "ERROR"`
TANGOREV=`cd ../../applications/tango/python ; git log -n 1 --date=iso --format=format:"rev[%ad] head[%h][%H] ref[%d]" HEAD || echo "ERROR"`
SPECREV=`cd ../../applications/spec ; git log -n 1 --date=iso --format=format:"rev[%ad] head[%h][%H] ref[%d]" HEAD || echo "ERROR"`
{
......
This diff is collapsed.
This diff is collapsed.
......@@ -144,6 +144,8 @@ WORD SyncCtrlObj::xlatLimaTrigMode2PcoAcqMode()
DEF_FNID;
WORD pcoAcqMode;
char *sLimaTriggerMode = "invalid";
char *sPcoAcqMode = "invalid";
if(!checkTrigMode(m_trig_mode)){
......@@ -166,33 +168,55 @@ WORD SyncCtrlObj::xlatLimaTrigMode2PcoAcqMode()
switch( m_trig_mode) {
case IntTrig: // 0 SOFT (spec)
pcoAcqMode= 0x0000;
case IntTrig: // 0 SOFT (spec)
sLimaTriggerMode = "IntTrig";
sPcoAcqMode = "acqEnbl_Ignored";
pcoAcqMode= 0x0000;
break;
case ExtTrigSingle:
case ExtTrigSingle:
// trig (at ACQ ENABLE) starts a sequence of int trigger (dimax only)
// StorageMode 0 - record mode
// RecorderSubmode 1 - ring buffer
// Triggermode 0 - auto
// Acquiremode 0 - auto / ignored
sLimaTriggerMode = "ExtTrigSingle";
sPcoAcqMode = "acqEnbl_Ignored";
pcoAcqMode= 0x0000;
break;
case ExtTrigMult:
sLimaTriggerMode = "ExtTrigMult";
sPcoAcqMode = "acqEnbl_Ignored";
pcoAcqMode= 0x0000;
break;
//case IntTrigMult: // 1 START (spec)
case ExtGate: // 2 GATE (spec)
sLimaTriggerMode = "ExtGate";
#ifdef DISABLE_ACQ_ENBL_SIGNAL
sPcoAcqMode = "acqEnbl_Ignored";
pcoAcqMode= 0x0000;
#else
pcoAcqMode= 0x0001;
sPcoAcqMode = "acqEnbl_TrigAccepted";
#endif
break;
// pcoAcqMode= 0x0002;
// sPcoAcqMode = "acqEnbl_startModulationMode";
default:
throw LIMA_HW_EXC(NotSupported,"Invalid value");
}
m_pcoData->traceAcq.iPcoAcqMode = pcoAcqMode;
m_pcoData->traceAcq.sLimaTriggerMode = sLimaTriggerMode;
m_pcoData->traceAcq.sPcoAcqMode = sPcoAcqMode;
DEB_ALWAYS() << fnId << ": " << DEB_VAR2(pcoAcqMode, m_trig_mode);
return pcoAcqMode;
......@@ -206,6 +230,8 @@ WORD SyncCtrlObj::xlatLimaTrigMode2PcoTrigMode(bool &ext_trig){
DEF_FNID;
WORD pcoTrigMode;
char *sLimaTriggerMode = "invalid";
char *sPcoTriggerMode = "invalid";
if(!checkTrigMode(m_trig_mode)){
throw LIMA_HW_EXC(NotSupported,"Trigger type not supported");
......@@ -221,7 +247,15 @@ WORD SyncCtrlObj::xlatLimaTrigMode2PcoTrigMode(bool &ext_trig){
// sequence, then exposures and sensor readout are started simultaneously.
// Signals at the trigger input (<exp trig>) are irrelevant.
default:
sLimaTriggerMode = "intTrig_DEFAULT";
sPcoTriggerMode = "auto";
ext_trig = false;
pcoTrigMode= 0x0000; // 0 = SOFT (spec)
break;
case IntTrig:
sLimaTriggerMode = "intTrig";
sPcoTriggerMode = "auto";
ext_trig = false;
pcoTrigMode= 0x0000; // 0 = SOFT (spec)
break;
......@@ -231,6 +265,8 @@ WORD SyncCtrlObj::xlatLimaTrigMode2PcoTrigMode(bool &ext_trig){
// (depending on the DIP switch setting) of the trigger input (<exp trig>).
//case IntTrigMult: return 0x0002; // 1 = START (spec)
case ExtTrigMult:
sLimaTriggerMode = "ExtTrigMult";
sPcoTriggerMode = "startExposure";
ext_trig = true;
pcoTrigMode= 0x0002; // 1 = START (spec)
break;
......@@ -242,6 +278,8 @@ WORD SyncCtrlObj::xlatLimaTrigMode2PcoTrigMode(bool &ext_trig){
// time length control is also possible for double image mode; exposure
// time of the second image is given by the readout time of the first image.)
case ExtGate:
sLimaTriggerMode = "ExtGate";
sPcoTriggerMode = "extGate";
ext_trig = true;
pcoTrigMode= 0x0003; // 2 = GATE (spec)
break;
......@@ -253,6 +291,8 @@ WORD SyncCtrlObj::xlatLimaTrigMode2PcoTrigMode(bool &ext_trig){
// RecorderSubmode 1 - ring buffer
// Triggermode 0 - auto
// Acquiremode 0 - auto / ignored
sLimaTriggerMode = "ExtTrigSingle";
sPcoTriggerMode = "auto";
ext_trig = true;
pcoTrigMode= 0x0000;
break;
......@@ -260,6 +300,9 @@ WORD SyncCtrlObj::xlatLimaTrigMode2PcoTrigMode(bool &ext_trig){
}
m_pcoData->traceAcq.iPcoTriggerMode = pcoTrigMode;
m_pcoData->traceAcq.sLimaTriggerMode = sLimaTriggerMode;
m_pcoData->traceAcq.sPcoTriggerMode = sPcoTriggerMode;
DEB_ALWAYS() << fnId <<": " << DEB_VAR3(pcoTrigMode, m_trig_mode, ext_trig);
......
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