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

Merge branch '2.1' into developer

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-09-30 15:13:34 +02:00
commit 1aec6a71a1
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

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