detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-12 21:07: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

17
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -374,14 +374,15 @@ int slsReceiverTCPIPInterface::set_detector_type(){
}
if(ret != FAIL){
#ifndef REST
if(receiverBase) delete receiverBase;
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);