diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index e02943bce..889001594 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -3672,7 +3672,7 @@ slsDetectorDefs::runStatus multiSlsDetector::getReceiverStatus(){ -int multiSlsDetector::getFramesCaughtByReciver() { +int multiSlsDetector::getFramesCaughtByReceiver() { int ret=0,ret1=0; for (int i=0; inumberOfDetectors; i++) if (detectors[i]) @@ -3687,6 +3687,20 @@ int multiSlsDetector::getFramesCaughtByReciver() { +int multiSlsDetector::getCurrentFrameIndex() { + int ret=0,ret1=0; + for (int i=0; inumberOfDetectors; 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) { diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h index e45c0b5b9..4a8204626 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h @@ -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