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

check not done

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-10-18 15:31:48 +02:00
parent 028ba57876
commit f535e11bba
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -1037,10 +1037,8 @@ int multiSlsDetector::setOnline(int off) {
for (int i=0; i<thisMultiDetector->numberOfDetectors; i++) { for (int i=0; i<thisMultiDetector->numberOfDetectors; i++) {
if (detectors[i]){ if (detectors[i]){
detectors[i]->setOnline(off); detectors[i]->setOnline(off);
if(detectors[i]->getErrorMask()){ if(detectors[i]->getErrorMask())
setErrorMask(getErrorMask()|(1<<i)); setErrorMask(getErrorMask()|(1<<i));
cprintf(BG_RED,"Setting error mask for %d\n",i);
}
} }
} }
} }

8
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -1246,16 +1246,16 @@ string slsDetector::checkOnline() {
delete controlSocket; delete controlSocket;
controlSocket=NULL; controlSocket=NULL;
retval = string(thisDetector->hostname); retval = string(thisDetector->hostname);
//#ifdef VERBOSE #ifdef VERBOSE
std::cout<< "offline!" << std::endl; std::cout<< "offline!" << std::endl;
//#endif #endif
} else { } else {
thisDetector->onlineFlag=ONLINE_FLAG; thisDetector->onlineFlag=ONLINE_FLAG;
controlSocket->SetTimeOut(100); controlSocket->SetTimeOut(100);
disconnectControl(); disconnectControl();
//#ifdef VERBOSE #ifdef VERBOSE
std::cout<< "online!" << std::endl; std::cout<< "online!" << std::endl;
//#endif #endif
} }
} }
return retval; return retval;