detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-11 12:27:14 +02:00
Code Issues Actions Packages Releases Activity

checkOnline works properly now and calls tcpsocket if controlsocket not defined

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@245 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-09-10 15:15:43 +00:00
parent 2cfdc2b108
commit 5cb68d870e
7 changed files with 62 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -885,19 +885,18 @@ int multiSlsDetector::setOnline(int off) {
int multiSlsDetector::checkOnline() {
int ret1=-100,ret;
string multiSlsDetector::checkOnline() {
string retval1 = "",retval;
for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
if (detectors[idet]) {
ret=detectors[idet]->checkOnline();
cout<<"ret:"<<ret<<endl;
if (ret1==-100)
ret1=ret;
else if (ret!=ret1)
ret1=-1;
retval=detectors[idet]->checkOnline();
if(!retval.empty()){
retval1.append(retval);
retval1.append("+");
}
}
}
return ret1;
return retval1;
};

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -360,7 +360,7 @@ class multiSlsDetector : public slsDetectorUtils {
/** checks if each of the detectors are online
\returns online/offline status and -1 if any of the detector's online status is different from the other
*/
int checkOnline();
string checkOnline();
/**