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

make t crash

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-11-01 15:02:14 +01:00
parent 7fc82723b5
commit 1f3a418d93
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
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,6 +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]){

6
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -7143,7 +7143,11 @@ string slsDetector::setFileName(string s) {
} }
} }
return fileIO::getFileName(); pthread_mutex_lock(&ms);
s = fileIO::getFileName();
pthread_mutex_unlock(&ms);
return s;
} }

15
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
View File

@ -496,21 +496,24 @@ void* postProcessing::processData(int delflag) {
else{ else{
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);
if(setReceiverOnline() == ONLINE_FLAG){ if(setReceiverOnline() == ONLINE_FLAG){
pthread_mutex_lock(&mg);
caught = getFramesCaughtByReceiver(); caught = getFramesCaughtByReceiver();
pthread_mutex_unlock(&mg);
} }
pthread_mutex_unlock(&mg);
//updating progress //updating progress
if(caught!= -1){ if(caught!= -1){
setCurrentProgress(caught); setCurrentProgress(caught);
@ -521,7 +524,7 @@ void* postProcessing::processData(int delflag) {
if (checkJoinThread()){ if (checkJoinThread()){
break; break;
} }
*/
} }