mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2026-01-16 08:39:21 +01:00
included lock receiver and update clients for receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@284 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
@@ -3736,3 +3736,50 @@ int multiSlsDetector::getFramesCaughtByReciver() {
|
||||
|
||||
|
||||
|
||||
|
||||
int multiSlsDetector::lockReceiver(int lock) {
|
||||
|
||||
int ret=-100, ret1;
|
||||
|
||||
for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
|
||||
if (detectors[idet]) {
|
||||
ret1=detectors[idet]->lockReceiver(lock);
|
||||
if (ret==-100)
|
||||
ret=ret1;
|
||||
else if (ret!=ret1)
|
||||
ret=-1;
|
||||
}
|
||||
}
|
||||
|
||||
return ret;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
string multiSlsDetector::getReceiverLastClientIP() {
|
||||
string s0="", s1="",s ;
|
||||
|
||||
for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
|
||||
if (detectors[idet]) {
|
||||
s=detectors[idet]->getReceiverLastClientIP();
|
||||
|
||||
if (s0=="")
|
||||
s0=s;
|
||||
else
|
||||
s0+=string("+")+s;
|
||||
if (s1=="")
|
||||
s1=s;
|
||||
else if (s1!=s)
|
||||
s1="bad";
|
||||
}
|
||||
}
|
||||
if (s1=="bad")
|
||||
return s0;
|
||||
else
|
||||
return s1;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1063,6 +1063,18 @@ class multiSlsDetector : public slsDetectorUtils {
|
||||
*/
|
||||
int getFramesCaughtByReciver();
|
||||
|
||||
/** Locks/Unlocks the connection to the receiver
|
||||
/param lock sets (1), usets (0), gets (-1) the lock
|
||||
/returns lock status of the receiver
|
||||
*/
|
||||
int lockReceiver(int lock=-1);
|
||||
|
||||
/**
|
||||
Returns the IP of the last client connecting to the receiver
|
||||
*/
|
||||
string getReceiverLastClientIP();
|
||||
|
||||
|
||||
|
||||
protected:
|
||||
|
||||
|
||||
Reference in New Issue
Block a user