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

back to not asking getframescaught

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-11-01 15:59:43 +01:00
parent 1f3a418d93
commit f0ac9a2e9c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -4928,7 +4928,7 @@ slsDetectorDefs::runStatus multiSlsDetector::getReceiverStatus(){
int multiSlsDetector::getFramesCaughtByReceiver() { int multiSlsDetector::getFramesCaughtByReceiver() {
int ret=0,ret1=0; int ret=0,ret1=0;
/*
if(thisMultiDetector->numberOfDetectors>10) { if(thisMultiDetector->numberOfDetectors>10) {
if (detectors[0]){ if (detectors[0]){
ret =detectors[0]->getFramesCaughtByReceiver(); ret =detectors[0]->getFramesCaughtByReceiver();
@ -4937,7 +4937,7 @@ int multiSlsDetector::getFramesCaughtByReceiver() {
} }
return ret; return ret;
} }
*/
for (int i=0; i<thisMultiDetector->numberOfDetectors; i++) for (int i=0; i<thisMultiDetector->numberOfDetectors; i++)
if (detectors[i]){ if (detectors[i]){

8
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
View File

@ -497,15 +497,15 @@ void* postProcessing::processData(int delflag) {
int caught = -1; int caught = -1;
while(true){ while(true){
cout.flush(); //cout.flush();
cout<<flush; //cout<<flush;
usleep(40000); //20ms need this else connecting error to receiver (too fast) usleep(40000); //20ms need this else connecting error to receiver (too fast)
if (checkJoinThread()){ if (checkJoinThread()){
break; break;
} }
/*
//get progress //get progress
pthread_mutex_lock(&mg); pthread_mutex_lock(&mg);
if(setReceiverOnline() == ONLINE_FLAG){ if(setReceiverOnline() == ONLINE_FLAG){
@ -524,7 +524,7 @@ void* postProcessing::processData(int delflag) {
if (checkJoinThread()){ if (checkJoinThread()){
break; break;
} }
*/
} }