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

receiver online flag sets back to offline if it tried to connect and didnt work

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@280 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2012-10-03 08:58:01 +00:00
parent d6ff3e9227
commit 6f9e265949
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -3560,11 +3560,16 @@ int multiSlsDetector::readDataFile(string fname, int *data) {
int multiSlsDetector::setReceiverOnline(int off) { int multiSlsDetector::setReceiverOnline(int off) {
if (off!=GET_ONLINE_FLAG) { if (off!=GET_ONLINE_FLAG) {
thisMultiDetector->receiverOnlineFlag=off; int ret=-100,ret1;
for (int i=0; i<thisMultiDetector->numberOfDetectors+1; i++) { for (int i=0; i<thisMultiDetector->numberOfDetectors+1; i++)
if (detectors[i]) if (detectors[i]){
detectors[i]->setReceiverOnline(off); ret1=detectors[i]->setReceiverOnline(off);
} if(ret==-100)
ret=ret1;
else if (ret!=ret1)
ret=-1;
}
thisMultiDetector->receiverOnlineFlag=ret;
} }
return thisMultiDetector->receiverOnlineFlag; return thisMultiDetector->receiverOnlineFlag;
} }

3
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -5326,7 +5326,8 @@ int slsDetector::setReceiverOnline(int off) {
if (off!=GET_ONLINE_FLAG) { if (off!=GET_ONLINE_FLAG) {
thisDetector->receiverOnlineFlag=off; thisDetector->receiverOnlineFlag=off;
if (thisDetector->receiverOnlineFlag==ONLINE_FLAG) if (thisDetector->receiverOnlineFlag==ONLINE_FLAG)
setReceiverTCPSocket(); if(setReceiverTCPSocket()==FAIL)
thisDetector->receiverOnlineFlag=OFFLINE_FLAG;
} }
return thisDetector->receiverOnlineFlag; return thisDetector->receiverOnlineFlag;
} }