detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 20:39:22 +01:00
Code Issues Actions Packages Releases Activity

conflict merged fix, lockin in stop and startandreadallnowait, r_restreamstop moved to stop

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-12-08 11:45:29 +01:00
parent 4718378d0a 40a7b3983a
commit 6e876d79ee
8 changed files with 28 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
View File

@@ -418,9 +418,7 @@ int postProcessing::fillBadChannelMask() {
void* postProcessing::processData(int delflag) {
pthread_mutex_lock(&mg);
if(setReceiverOnline()==OFFLINE_FLAG){
pthread_mutex_unlock(&mg);
#ifdef VERBOSE
std::cout<< " ??????????????????????????????????????????? processing data - threaded mode " << *threadedProcessing << endl;
@@ -505,8 +503,6 @@ void* postProcessing::processData(int delflag) {
}
} //receiver
else{
pthread_mutex_unlock(&mg);
//cprintf(RED,"In post processing threads\n");
if(dataReady) {
@@ -535,11 +531,11 @@ void* postProcessing::processData(int delflag) {
//get progress
pthread_mutex_lock(&mg);
if(setReceiverOnline() == ONLINE_FLAG){
pthread_mutex_lock(&mg);
caught = getFramesCaughtByAnyReceiver();
pthread_mutex_unlock(&mg);
}
pthread_mutex_unlock(&mg);
//updating progress