detectors/slsDetectorPackage
24
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-12-26 14:11:18 +01:00
Code Issues Actions Packages Releases Activity

REST implementation removed from slsReceiver

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-12-05 11:03:52 +01:00
parent 61791c078c
commit 65b4c69847
16 changed files with 34 additions and 987 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@@ -761,9 +761,8 @@ int slsReceiverTCPIPInterface::set_detector_type(){
break;
}
if(ret == OK) {
#ifndef REST
if(receiverBase == NULL){
receiverBase = UDPInterface::create("standard");
receiverBase = UDPInterface::create();
if(startAcquisitionCallBack)
receiverBase->registerCallBackStartAcquisition(startAcquisitionCallBack,pStartAcquisition);
if(acquisitionFinishedCallBack)
@@ -771,7 +770,6 @@ int slsReceiverTCPIPInterface::set_detector_type(){
if(rawDataReadyCallBack)
receiverBase->registerCallBackRawDataReady(rawDataReadyCallBack,pRawDataReady);
}
#endif
myDetectorType = dr;
ret = receiverBase->setDetectorType(myDetectorType);
retval = myDetectorType;