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

doxygen for slsReceiver and slsReceiverInterface

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@315 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-10-26 09:38:54 +00:00
parent 83775bd7f3
commit 8387f70071
8 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -3673,15 +3673,14 @@ slsDetectorDefs::runStatus multiSlsDetector::getReceiverStatus(){
int multiSlsDetector::getFramesCaughtByReciver() {
int ret=-100,ret1;
int ret=0,ret1=0;
for (int i=0; i<thisMultiDetector->numberOfDetectors; i++)
if (detectors[i]){
ret1=detectors[i]->getFramesCaughtByReciver();
if(ret==-100)
ret=ret1;
else if (ret!=ret1)
ret=-1;
}
if (detectors[i])
ret1+=detectors[i]->getFramesCaughtByReceiver();
if(!thisMultiDetector->numberOfDetectors)
return ret;
ret=(int)(ret1/thisMultiDetector->numberOfDetectors);
return ret;
}

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -1076,7 +1076,7 @@ class multiSlsDetector : public slsDetectorUtils {
/** gets the number of frames caught by receiver
\returns number of frames caught by receiver
*/
int getFramesCaughtByReciver();
int getFramesCaughtByReceiver();
/** Locks/Unlocks the connection to the receiver
/param lock sets (1), usets (0), gets (-1) the lock