diff --git a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c index 104007fb7..40caa1ec9 100644 --- a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c @@ -871,6 +871,11 @@ void readFrame(int *ret, char *mess){ return; } } + + //wait for detector to send + + + printf("*****Done Waiting...\n"); *ret = (int)FINISHED; strcpy(mess,"acquisition successfully finished\n"); diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp b/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp index 7c3b13a6d..bdc02f9cc 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp @@ -160,12 +160,12 @@ int slsDetectorUtils::acquire(int delflag){ } - if (*threadedProcessing) + /*if (*threadedProcessing) startThread(delflag); #ifdef VERBOSE cout << " starting thread " << endl; #endif - +*/ //resets frames caught in receiver if(receiver){ pthread_mutex_lock(&mg); @@ -326,7 +326,7 @@ int slsDetectorUtils::acquire(int delflag){ cout << "done! " << endl; #endif - +/* if (*threadedProcessing==0){ #ifdef VERBOSE cout << "start unthreaded process data " << endl; @@ -334,7 +334,7 @@ int slsDetectorUtils::acquire(int delflag){ processData(delflag); } - +*/ } else break; @@ -461,7 +461,7 @@ int slsDetectorUtils::acquire(int delflag){ // loop measurements } - +/* // waiting for the data processing thread to finish! if (*threadedProcessing) { #ifdef VERBOSE @@ -473,7 +473,7 @@ int slsDetectorUtils::acquire(int delflag){ cout << "data processing thread joined" << endl; #endif } - +*/ if(progress_call) progress_call(getCurrentProgress(),pProgressCallArg);