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

fixed 32 progress problem, and increased debugging

Browse Source
This commit is contained in:
Dhanya Maliakal
2015-06-30 17:20:23 +02:00
parent f29f9b701d
commit a3a2db1f73
7 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
View File

@ -501,6 +501,8 @@ void* postProcessing::processData(int delflag) {
int currentFrameIndex = -1;
bool newData = false;
int nthframe = setReadReceiverFrequency(0);
#ifdef VERBOSE
std::cout << "receiver read freq:" << nthframe << std::endl;
#endif
@ -531,8 +533,14 @@ void* postProcessing::processData(int delflag) {
pthread_mutex_unlock(&mg);
//updating progress
if(currentAcquisitionIndex != -1)
setCurrentProgress(currentAcquisitionIndex+1);
if(currentAcquisitionIndex != -1){
if(subframe){
pthread_mutex_lock(&mg);
setCurrentProgress(getFramesCaughtByReceiver());
pthread_mutex_unlock(&mg);
}else
setCurrentProgress(currentAcquisitionIndex+1);
}
#ifdef VERY_VERY_DEBUG
cout << "currentAcquisitionIndex:" << currentAcquisitionIndex << endl;
#endif