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

done

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-10-18 11:10:42 +02:00
parent 1bade91254
commit 9f28cc686c
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -5126,9 +5126,9 @@ void multiSlsDetector::startReceivingDataThread(){
datavalue--; datavalue--;
if(!datavalue){ if(!datavalue){
//#ifdef VERYVERBOSE #ifdef VERYVERBOSE
cprintf(RED,"End of socket for %d\n", ithread); cprintf(RED,"End of socket for %d\n", ithread);
//#endif #endif
singleframe[ithread] = NULL; singleframe[ithread] = NULL;
break; break;
} }
@ -5602,7 +5602,7 @@ int multiSlsDetector::enableDataStreamingFromReceiver(int enable){
} }
} }
} }else enable = threadStarted;
int ret=-100, ret1; int ret=-100, ret1;
for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) { for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
if (detectors[idet]) { if (detectors[idet]) {
@ -5616,9 +5616,6 @@ int multiSlsDetector::enableDataStreamingFromReceiver(int enable){
} }
} }
if(enable == -1)
return threadStarted;
else
return (threadStarted & ret); return (threadStarted & ret);
} }

4
slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
View File

@ -68,8 +68,8 @@ int slsDetectorUtils::acquire(int delflag){
//start/stop data streaming threads if threads in client enabled/disabled //start/stop data streaming threads if threads in client enabled/disabled
ret = enableDataStreamingFromReceiver(-1); ret = enableDataStreamingFromReceiver(-1);
//cout<<"getting datastream:"<<ret<<endl; // cout<<"getting datastream:"<<ret<<endl;
//cout<<"result of enabledatastream:"<<enableDataStreamingFromReceiver(ret)<<endl; // cout<<"result of enabledatastream:"<<enableDataStreamingFromReceiver(ret)<<endl;
} }
int nc=setTimer(CYCLES_NUMBER,-1); int nc=setTimer(CYCLES_NUMBER,-1);

5
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
View File

@ -481,7 +481,8 @@ void* postProcessing::processData(int delflag) {
} }
} }
//receiver //receiver
else{cprintf(RED,"In post processing threads\n"); else{
//cprintf(RED,"In post processing threads\n");
if(dataReady){ if(dataReady){
@ -517,7 +518,7 @@ void* postProcessing::processData(int delflag) {
//cout<<"exiting from proccessing thread"<<endl; //cout<<"exiting from proccessing thread"<<endl;
cprintf(RED,"Exiting post processing thread\n"); //cprintf(RED,"Exiting post processing thread\n");
} }
return 0; return 0;