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

minor

Browse Source
This commit is contained in:
Erik Frojdh 2018-10-11 16:19:44 +02:00
parent 22e8c52bd8
commit 1895ee1ebe
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -882,7 +882,7 @@ slsDetectorDefs::detectorType slsDetector::getDetectorType(const char *name, int
} else { } else {
char mess[MAX_STR_LENGTH]; char mess[MAX_STR_LENGTH];
mySocket->ReceiveDataOnly(mess,sizeof(mess)); mySocket->ReceiveDataOnly(mess,sizeof(mess));
std::cout<< "Detector returned error: " << m << std::endl; std::cout<< "Detector returned error: " << mess << std::endl;
} }
mySocket->Disconnect(); mySocket->Disconnect();
} else { } else {
@ -1245,7 +1245,6 @@ int slsDetector::setTCPSocket(std::string const name, int const control_port, in
int slsDetector::setPort(portType index, int num) { int slsDetector::setPort(portType index, int num) {
int fnum=F_SET_PORT, fnum2 = F_SET_RECEIVER_PORT; int fnum=F_SET_PORT, fnum2 = F_SET_RECEIVER_PORT;
int retval; int retval;
// uint64_t ut; // uint64_t ut;
@ -3383,7 +3382,6 @@ std::string slsDetector::setNetworkParameter(networkParameter index, std::string
std::string slsDetector::getNetworkParameter(networkParameter index) { std::string slsDetector::getNetworkParameter(networkParameter index) {
std::ostringstream ss;std::string s;
switch (index) { switch (index) {
case DETECTOR_MAC: case DETECTOR_MAC:
return getDetectorMAC(); return getDetectorMAC();
@ -3420,7 +3418,7 @@ std::string slsDetector::getNetworkParameter(networkParameter index) {
return getReceiverRealUDPSocketBufferSize(); return getReceiverRealUDPSocketBufferSize();
default: default:
return (char*)("unknown network parameter"); return std::string("unknown network parameter");
} }
} }
@ -6435,7 +6433,7 @@ slsDetectorDefs::runStatus slsDetector::getReceiverStatus() {
int fnum=F_GET_RECEIVER_STATUS; int fnum=F_GET_RECEIVER_STATUS;
int ret = FAIL; int ret = FAIL;
int retval=-1; int retval=-1;
runStatus s=ERROR; runStatus s = ERROR;
if (thisDetector->receiverOnlineFlag==ONLINE_FLAG) { if (thisDetector->receiverOnlineFlag==ONLINE_FLAG) {
#ifdef VERBOSE #ifdef VERBOSE
@ -6448,9 +6446,8 @@ slsDetectorDefs::runStatus slsDetector::getReceiverStatus() {
if(retval!=-1) if(retval!=-1)
s=(runStatus)retval; s=(runStatus)retval;
if(ret==FORCE_UPDATE) if(ret==FORCE_UPDATE)
ret=updateReceiver(); updateReceiver();
} }
return s; return s;
} }