- new FW of CLHS doesn't allow LUT calls / fixed

parent b66fa1d8
2018/09/04 16:57:26 ==========================================
scp: copied local directory to segfs and /tmp_14_days:
from: [../../install/] and [./bat/]
to: [blissadm@lid00a:/segfs/bliss/projects/LIMA/build/depot_win/win_vc9/pco/install-2018-09-04_165718]
to: [/t/rhoms1/install-2018-09-04_165718]
to: [/t/rhoms1/install-beta]
2018/09/04 16:43:09 ==========================================
#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-13 16:17:08 +0200] head[b66fa1d][b66fa1d82ec7e0732d10096eb0d31c7de137c4c7] ref[ (HEAD -> wip01, github/wip01)] at [2018/09/04 16:43:08] $"
#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/09/04 16:43:08] $"
#define PROCLIB_GIT_VERSION "$Id: PROCLIB rev[2018-01-12 12:04:00 +0100] head[8175ab6][8175ab6cef2b729d69449e2845483df01262ee04] ref[ (HEAD)] at [2018/09/04 16:43:08] $"
#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/09/04 16:43:08] $"
#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/09/04 16:43:08] $"
#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/09/04 16:43:08] $"
2018/07/13 10:20:30 ==========================================
#define PCO_SDK_LIN_VERSION "$Id: PCOSDK_LIN [pcoDev.1.1.14] $"
......
......@@ -4,6 +4,110 @@
#===================================================
#===================================================
#===================================================
# 2018/09/04 / upgrade of the firmware of pco edge hs (bm05)
# new fw for CLHS doesn't allow LUT functions
#===================================================
$Id: comp[2017/07/12 09:24:19] file[2017/07/12 08:55:04] [..\..\..\..\src\PcoCamera.cpp] $
$Id: comp[2017/07/12 09:14:15] file[2017/07/12 08:55:04] [..\..\..\..\src\PcoSyncCtrlObj.cpp] $
$Id: comp[2017/07/12 09:14:17] file[2017/07/12 08:55:04] [..\..\..\..\src\PcoInterface.cpp] $
$Id: comp[2017/07/12 09:14:28] file[2017/07/12 08:55:04] [..\..\..\..\src\PcoBufferCtrlObj.cpp] $
$Id: comp[2017/07/12 09:14:20] file[2017/07/12 08:55:04] [..\..\..\..\src\PcoDetInfoCtrlObj.cpp] $
$Id: comp[2017/07/12 09:14:21] file[2017/07/12 08:55:04] [..\..\..\..\src\PcoCameraUtils.cpp] $
$Id: comp[2017/07/12 09:14:16] file[2017/07/12 08:55:04] [..\..\..\..\src\PcoRoiCtrlObj.cpp] $
$Id: PCO rev[2017-07-12 08:15:38 +0200] head[eae3c10][eae3c108127ae99d6f68747a3240179147fa42f8] ref[ (HEAD, gitrh/pco-dev02, pco-dev02)] at [2017/07/
12 09:22:50] $
$Id: PCOSDK [1.20] $
$Id: PROCLIB rev[2017-03-07 10:24:42 +0100] head[c80632d][c80632d5298bd81c4feb7cca52f7619884d9371e] ref[ (HEAD)] at [2017/07/12 09:22:50] $
$Id: LIBCONFIG rev[2013-02-07 18:08:29 +0100] head[89c411a][89c411a541d4ab4d66257ccb85749853fd685cbb] ref[ (HEAD, github/master, github/HEAD, master)] at [
2017/07/12 09:22:50] $
$Id: LIMA rev[2017-07-07 11:15:03 +0200] head[cb35d0f][cb35d0f3a77e09381c5e149d3463d28dd7870067] ref[ (HEAD, tag: tango-camera-pco-1.7.5, github/core-
1.7, core-1.7)] at [2017/07/12 09:22:50] $
$Id: TANGO rev[2017-07-07 11:15:03 +0200] head[a0f38d2][a0f38d21199cc95f5e2a832478b534977b0249fb] ref[ (HEAD, github/master, github/HEAD, master)] at [
2017/07/12 09:22:50] $
$Id: SPEC rev[2017-07-06 16:48:28 +0200] head[ea1013d][ea1013d3628c9cba1fd2491ebb4ed834e42eac24] ref[ (HEAD)] at [2017/07/12 09:22:50] $
timestamp: 2018/09/04 15:15:27
computer name: WBM05PCO3
user name: opd05
VS configuration: platform[x64] configuration[Release]
PCO SDK version: file[sc2_cam.dll] ver[1.20.1]
* PCO EDGE hs (EDGE_42) (I/F CAMERALINK_HS) (SN 61003169)
--- 2018/09/04 15:21:38 lima::Pco::Camera::prepareAcq [ENTRY]
lima::Pco::SyncCtrlObj::xlatLimaTrigMode2Pco (..\..\..\..\src\PcoSyncCtrlObj.cpp:290):
... sLimaTriggerMode=IntTrig
... sPcoTriggerMode=auto, pcoTrigMode=0, extTrig=0
... sPcoAcqMode=acqEnbl_Ignored, pcoAcqMode=0
lima::Pco::Camera::_pco_SetTransferParameter_SetActiveLookupTable (..\..\..\..\src\PcoCameraSdkAdd.cpp:2393): LIMA_HW_EXC ===> PCO_GetActiveLookupTable Pco
Error[0x80031020][Firmware error 80031020 at device 'SC2 Main uP': Command/data not supported by this hardware. [..\..\..\..\src\PcoCameraSdkAdd.cpp][2392]
] error[0x80031020]
#===================================================
# 2018/09/04 / new server directory struture
# new fw for CLHS doesn't allow LUT functions
#===================================================
C:\blissadm\pco\install-beta>tree /F /A
| INSTALL_VERSION.txt
| sip.pyd
|
+---bat
| lima_pco_ds.bat
| lima_pco_ds2.bat
| logsbackup.bat
| logsoff.bat
| logson.bat
|
\---Lima
| Core.py
| Debug.py
| libconfig++.dll
| LibLimaCore.dll
| liblimapco.dll
| libprocesslib.dll
| limacore.pyd
| limapco.pyd
| Pco.py
| processlib.pyd
| SC2_Cam.dll
| sc2_clhs.dll ---> copied from sc2_clhs_v1.3.32.dll
| sc2_clhs_org.dll ---> sc2_clhs.dll original
| sc2_clhs_v1.3.32.dll ---> copied to sc2_clhs.dll
| sc2_cl_me4.dll
| __init__.py
|
\---Server
| AttrHelper.py
| EnvHelper.py
| LimaCCDs.py
| __init__.py
|
+---camera
| Pco.py
| __init__.py
|
\---plugins
AccThresholdExample.py
BackgroundSubstraction.py
FlatField.py
LimaTacoCCD.py
LiveViewer.py
Mask.py
PeakFinder.py
Roi2Spectrum.py
RoiCounter.py
Utils.py
__init__.py
#===================================================
# 2018/04/24 / RecorderForcedFifo
# requested by Solei
......
......@@ -2393,19 +2393,35 @@ void Camera::_pco_SetTransferParameter_SetActiveLookupTable(int &error){
// PCO_SetActiveLookupTable
//================================================================================================
if(doLut) {
if(doLut && !_isInterfaceType(ifCameralinkHS) )
{
WORD _wLUT_Identifier, _wLUT_Parameter;
PCO_FN3(error, pcoFn,PCO_GetActiveLookupTable, m_handle, &_wLUT_Identifier, &_wLUT_Parameter);
PCO_THROW_OR_TRACE(error, pcoFn) ;
error = PCO_GetActiveLookupTable(m_handle, &_wLUT_Identifier, &_wLUT_Parameter);
PCO_CHECK_ERROR(error, "PCO_GetActiveLookupTable");
if(error)
{
DEB_ALWAYS() << "ERROR - PCO_GetActiveLookupTable";
}
if(_wLUT_Identifier != m_pcoData->wLUT_Identifier) {
PCO_FN3(error, pcoFn,PCO_SetActiveLookupTable, m_handle, &m_pcoData->wLUT_Identifier, &m_pcoData->wLUT_Parameter);
PCO_THROW_OR_TRACE(error, pcoFn) ;
error = PCO_SetActiveLookupTable(m_handle, &m_pcoData->wLUT_Identifier, &m_pcoData->wLUT_Parameter);
PCO_CHECK_ERROR(error, "PCO_SetActiveLookupTable");
if(error)
{
DEB_ALWAYS() << "ERROR - PCO_SetActiveLookupTable";
}
_armRequired(true);
PCO_FN3(error, pcoFn,PCO_GetActiveLookupTable, m_handle, &m_pcoData->wLUT_Identifier, &m_pcoData->wLUT_Parameter);
PCO_THROW_OR_TRACE(error, pcoFn) ;
error =PCO_GetActiveLookupTable(m_handle, &m_pcoData->wLUT_Identifier, &m_pcoData->wLUT_Parameter);
PCO_CHECK_ERROR(error, "PCO_GetActiveLookupTable");
if(error)
{
DEB_ALWAYS() << "ERROR - PCO_GetActiveLookupTable";
}
}
}
......
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