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

frame index updated for receiver

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@321 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2012-10-29 13:46:22 +00:00
parent e94677cbf5
commit 69d08ac546
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -3672,7 +3672,7 @@ slsDetectorDefs::runStatus multiSlsDetector::getReceiverStatus(){
int multiSlsDetector::getFramesCaughtByReciver() {
int multiSlsDetector::getFramesCaughtByReceiver() {
int ret=0,ret1=0;
for (int i=0; i<thisMultiDetector->numberOfDetectors; i++)
if (detectors[i])
@ -3687,6 +3687,20 @@ int multiSlsDetector::getFramesCaughtByReciver() {
int multiSlsDetector::getCurrentFrameIndex() {
int ret=0,ret1=0;
for (int i=0; i<thisMultiDetector->numberOfDetectors; i++)
if (detectors[i])
ret1+=detectors[i]->getCurrentFrameIndex();
if(!thisMultiDetector->numberOfDetectors)
return ret;
ret=(int)(ret1/thisMultiDetector->numberOfDetectors);
return ret;
}
int multiSlsDetector::lockReceiver(int lock) {

6
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -1078,6 +1078,12 @@ class multiSlsDetector : public slsDetectorUtils {
*/
int getFramesCaughtByReceiver();
/** gets the current frame index of receiver
\returns current frame index of receiver
*/
int getCurrentFrameIndex();
/** Locks/Unlocks the connection to the receiver
/param lock sets (1), usets (0), gets (-1) the lock
/returns lock status of the receiver