From 01ed24263f228a62680a238c7fdcc5970a38656a Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Thu, 29 Sep 2016 10:29:24 +0200 Subject: [PATCH 1/2] updaterev --- slsReceiverSoftware/gitInfo.txt | 10 +++++----- slsReceiverSoftware/include/gitInfoReceiver.h | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/slsReceiverSoftware/gitInfo.txt b/slsReceiverSoftware/gitInfo.txt index 82c68fc0a..6e3160308 100644 --- a/slsReceiverSoftware/gitInfo.txt +++ b/slsReceiverSoftware/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsReceiverSoftware 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 -Repsitory UUID: 10000196185a0991cd13457cd69966d79f860134 -Revision: 251 +Repsitory UUID: 1c7a5892a984a6954b8f65e052e803a908153e9f +Revision: 254 Branch: developer -Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 251 -Last Changed Date: 2016-08-12 13:48:30 +0200 +Last Changed Author: wang_x1_ +Last Changed Rev: 254 +Last Changed Date: 2016-09-14 11:58:39 +0200 diff --git a/slsReceiverSoftware/include/gitInfoReceiver.h b/slsReceiverSoftware/include/gitInfoReceiver.h index 10c4e9caa..168f020ed 100644 --- a/slsReceiverSoftware/include/gitInfoReceiver.h +++ b/slsReceiverSoftware/include/gitInfoReceiver.h @@ -1,11 +1,11 @@ //#define SVNPATH "" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_receiver_software.git" //#define SVNREPPATH "" -#define SVNREPUUID "10000196185a0991cd13457cd69966d79f860134" -//#define SVNREV 0x251 +#define SVNREPUUID "1c7a5892a984a6954b8f65e052e803a908153e9f" +//#define SVNREV 0x254 //#define SVNKIND "" //#define SVNSCHED "" -#define SVNAUTH "Dhanya_Maliakal" -#define SVNREV 0x251 -#define SVNDATE 0x20160812 +#define SVNAUTH "wang_x1_" +#define SVNREV 0x254 +#define SVNDATE 0x20160914 // From 572047b72dec3bcd847b1fc0a3af98f60ba17ac5 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Fri, 30 Sep 2016 15:13:12 +0200 Subject: [PATCH 2/2] was making 3 threads for each set detector type command, because it created standard receiver object each time --- .../src/slsReceiverTCPIPInterface.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp index 1e2b5c49e..c1017a4a7 100644 --- a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp +++ b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp @@ -370,13 +370,15 @@ int slsReceiverTCPIPInterface::set_detector_type(){ } if(ret != FAIL){ #ifndef REST - receiverBase = UDPInterface::create("standard"); - if(startAcquisitionCallBack) - receiverBase->registerCallBackStartAcquisition(startAcquisitionCallBack,pStartAcquisition); - if(acquisitionFinishedCallBack) - receiverBase->registerCallBackAcquisitionFinished(acquisitionFinishedCallBack,pAcquisitionFinished); - if(rawDataReadyCallBack) - receiverBase->registerCallBackRawDataReady(rawDataReadyCallBack,pRawDataReady); + if(receiverBase == NULL){ + receiverBase = UDPInterface::create("standard"); + if(startAcquisitionCallBack) + receiverBase->registerCallBackStartAcquisition(startAcquisitionCallBack,pStartAcquisition); + if(acquisitionFinishedCallBack) + receiverBase->registerCallBackAcquisitionFinished(acquisitionFinishedCallBack,pAcquisitionFinished); + if(rawDataReadyCallBack) + receiverBase->registerCallBackRawDataReady(rawDataReadyCallBack,pRawDataReady); + } #endif myDetectorType = dr; ret=receiverBase->setDetectorType(myDetectorType);