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

in between

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-08-24 11:54:15 +02:00
parent 0a2a88e23f
commit f17a2ba2b8
6 changed files with 176 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -370,6 +370,7 @@ int slsReceiverTCPIPInterface::set_detector_type(){
}
if(ret != FAIL){
#ifndef REST
if(receiverBase) delete receiverBase;
receiverBase = UDPInterface::create("standard");
if(startAcquisitionCallBack)
receiverBase->registerCallBackStartAcquisition(startAcquisitionCallBack,pStartAcquisition);
@ -998,6 +999,10 @@ int slsReceiverTCPIPInterface::reset_frames_caught(){
strcpy(mess,SET_RECEIVER_ERR_MESSAGE);
ret=FAIL;
}
else if(receiverBase->getStatus()==RUNNING){
strcpy(mess,"Cannot reset frames caught while status is running\n");
ret=FAIL;
}
else
receiverBase->resetAcquisitionCount();
}