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

got rid completely of threaded proccessing

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-11-02 07:28:29 +01:00
parent 88d5e4c9a0
commit 4035f9263a
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -871,6 +871,11 @@ void readFrame(int *ret, char *mess){
return; return;
} }
} }
//wait for detector to send
printf("*****Done Waiting...\n"); printf("*****Done Waiting...\n");
*ret = (int)FINISHED; *ret = (int)FINISHED;
strcpy(mess,"acquisition successfully finished\n"); strcpy(mess,"acquisition successfully finished\n");

12
slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
View File

@ -160,12 +160,12 @@ int slsDetectorUtils::acquire(int delflag){
} }
if (*threadedProcessing) /*if (*threadedProcessing)
startThread(delflag); startThread(delflag);
#ifdef VERBOSE #ifdef VERBOSE
cout << " starting thread " << endl; cout << " starting thread " << endl;
#endif #endif
*/
//resets frames caught in receiver //resets frames caught in receiver
if(receiver){ if(receiver){
pthread_mutex_lock(&mg); pthread_mutex_lock(&mg);
@ -326,7 +326,7 @@ int slsDetectorUtils::acquire(int delflag){
cout << "done! " << endl; cout << "done! " << endl;
#endif #endif
/*
if (*threadedProcessing==0){ if (*threadedProcessing==0){
#ifdef VERBOSE #ifdef VERBOSE
cout << "start unthreaded process data " << endl; cout << "start unthreaded process data " << endl;
@ -334,7 +334,7 @@ int slsDetectorUtils::acquire(int delflag){
processData(delflag); processData(delflag);
} }
*/
} else } else
break; break;
@ -461,7 +461,7 @@ int slsDetectorUtils::acquire(int delflag){
// loop measurements // loop measurements
} }
/*
// waiting for the data processing thread to finish! // waiting for the data processing thread to finish!
if (*threadedProcessing) { if (*threadedProcessing) {
#ifdef VERBOSE #ifdef VERBOSE
@ -473,7 +473,7 @@ int slsDetectorUtils::acquire(int delflag){
cout << "data processing thread joined" << endl; cout << "data processing thread joined" << endl;
#endif #endif
} }
*/
if(progress_call) if(progress_call)
progress_call(getCurrentProgress(),pProgressCallArg); progress_call(getCurrentProgress(),pProgressCallArg);