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

got rid of client telling detector that receiver is down each time it doesnt work

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@325 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2012-10-29 17:01:59 +00:00
parent f37cd6640f
commit 439c2b1de8
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -1062,9 +1062,6 @@ int slsDetector::setTCPSocket(string const name, int const control_port, int con
std::cout<< "offline!" << std::endl; std::cout<< "offline!" << std::endl;
#endif #endif
} }
//default receiver off. if it was on by default, client doesnt know
if(thisDetector->onlineFlag==ONLINE_FLAG)
detectorSendToReceiver(false);
return retval; return retval;
}; };
@ -5302,9 +5299,6 @@ int slsDetector::setReceiverOnline(int off) {
} }
} }
} }
//To ensure detector knows, if receiver suddenly went down
if((prev==ONLINE_FLAG)&&(thisDetector->receiverOnlineFlag==OFFLINE_FLAG))
detectorSendToReceiver(false);
return thisDetector->receiverOnlineFlag; return thisDetector->receiverOnlineFlag;
} }

1
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -790,6 +790,7 @@ string slsDetectorCommand::cmdAcquire(int narg, char *args[], int action) {
if(receiver) if(receiver)
myDet->stopReceiver(); myDet->stopReceiver();
return string(""); return string("");
} }