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

removed asking only 1 for framescaugh

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-10-19 10:22:35 +02:00
parent 749c64204e
commit 673e7c8f20
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -4902,19 +4902,30 @@ slsDetectorDefs::runStatus multiSlsDetector::getReceiverStatus(){
int multiSlsDetector::getFramesCaughtByReceiver() { int multiSlsDetector::getFramesCaughtByReceiver() {
int ret=0,ret1=0; int ret=0,ret1=0;
for (int i=0; i<thisMultiDetector->numberOfDetectors; i++)
if (detectors[i]){
ret1+=detectors[i]->getFramesCaughtByReceiver();
if(detectors[i]->getErrorMask())
setErrorMask(getErrorMask()|(1<<i));
} /*
if(!thisMultiDetector->numberOfDetectors) if(thisMultiDetector->numberOfDetectors>10) {
return ret; if (detectors[0]){
ret=(int)(ret1/thisMultiDetector->numberOfDetectors); ret =detectors[0]->getFramesCaughtByReceiver();
if(detectors[0]->getErrorMask())
setErrorMask(getErrorMask()|(1<<0));
}
return ret;
}
*/
for (int i=0; i<thisMultiDetector->numberOfDetectors; i++)
if (detectors[i]){
ret1+=detectors[i]->getFramesCaughtByReceiver();
if(detectors[i]->getErrorMask())
setErrorMask(getErrorMask()|(1<<i));
return ret; }
if(!thisMultiDetector->numberOfDetectors)
return ret;
ret=(int)(ret1/thisMultiDetector->numberOfDetectors);
return ret;
} }
@ -4939,15 +4950,6 @@ int multiSlsDetector::getReceiverCurrentFrameIndex() {
int multiSlsDetector::resetFramesCaught() { int multiSlsDetector::resetFramesCaught() {
int ret=-100, ret1; int ret=-100, ret1;
if(thisMultiDetector->numberOfDetectors>10) {
if (detectors[0]){
ret =detectors[0]->getFramesCaughtByReceiver();
if(detectors[0]->getErrorMask())
setErrorMask(getErrorMask()|(1<<0));
}
return ret;
}
for (int i=0; i<thisMultiDetector->numberOfDetectors; i++){ for (int i=0; i<thisMultiDetector->numberOfDetectors; i++){
if (detectors[i]){ if (detectors[i]){
ret1=detectors[i]->resetFramesCaught(); ret1=detectors[i]->resetFramesCaught();