detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-14 13:57:13 +02:00
Code Issues Actions Packages Releases Activity

merged thread error fix from developer

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-10-04 14:29:25 +02:00
parent 44870480be 1aec6a71a1
commit f6b7fd7aa3
3 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsReceiverSoftware/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsReceiverSoftware Path: slsDetectorsPackage/slsReceiverSoftware
URL: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git URL: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git
Repsitory UUID: 10000196185a0991cd13457cd69966d79f860134 Repsitory UUID: 1c7a5892a984a6954b8f65e052e803a908153e9f
Revision: 251 Revision: 254
Branch: developer Branch: developer
Last Changed Author: Dhanya_Maliakal Last Changed Author: wang_x1_
Last Changed Rev: 251 Last Changed Rev: 254
Last Changed Date: 2016-08-12 13:48:30 +0200 Last Changed Date: 2016-09-14 11:58:39 +0200

10
slsReceiverSoftware/include/gitInfoReceiver.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_receiver_software.git" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_receiver_software.git"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "10000196185a0991cd13457cd69966d79f860134" #define SVNREPUUID "1c7a5892a984a6954b8f65e052e803a908153e9f"
//#define SVNREV 0x251 //#define SVNREV 0x254
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal" #define SVNAUTH "wang_x1_"
#define SVNREV 0x251 #define SVNREV 0x254
#define SVNDATE 0x20160812 #define SVNDATE 0x20160914
// //

17
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -374,14 +374,15 @@ int slsReceiverTCPIPInterface::set_detector_type(){
} }
if(ret != FAIL){ if(ret != FAIL){
#ifndef REST #ifndef REST
if(receiverBase) delete receiverBase; if(receiverBase == NULL){
receiverBase = UDPInterface::create("standard"); receiverBase = UDPInterface::create("standard");
if(startAcquisitionCallBack) if(startAcquisitionCallBack)
receiverBase->registerCallBackStartAcquisition(startAcquisitionCallBack,pStartAcquisition); receiverBase->registerCallBackStartAcquisition(startAcquisitionCallBack,pStartAcquisition);
if(acquisitionFinishedCallBack) if(acquisitionFinishedCallBack)
receiverBase->registerCallBackAcquisitionFinished(acquisitionFinishedCallBack,pAcquisitionFinished); receiverBase->registerCallBackAcquisitionFinished(acquisitionFinishedCallBack,pAcquisitionFinished);
if(rawDataReadyCallBack) if(rawDataReadyCallBack)
receiverBase->registerCallBackRawDataReady(rawDataReadyCallBack,pRawDataReady); receiverBase->registerCallBackRawDataReady(rawDataReadyCallBack,pRawDataReady);
}
#endif #endif
myDetectorType = dr; myDetectorType = dr;
ret=receiverBase->setDetectorType(myDetectorType); ret=receiverBase->setDetectorType(myDetectorType);