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

merge conflict sorted, removing rest

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-12-05 11:25:10 +01:00
parent 28211af5af 536203b6dc
commit 0ef52138e1
17 changed files with 34 additions and 967 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -776,9 +776,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)
@ -786,7 +785,6 @@ int slsReceiverTCPIPInterface::set_detector_type(){
if(rawDataReadyCallBack)
receiverBase->registerCallBackRawDataReady(rawDataReadyCallBack,pRawDataReady);
}
#endif
myDetectorType = dr;
ret = receiverBase->setDetectorType(myDetectorType);
retval = myDetectorType;