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

makng the zmq work without external flag

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-27 17:06:18 +01:00
parent 3439ccbec9 c0a114345b
commit ca19993149
11 changed files with 112 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
View File

@ -509,11 +509,9 @@ void* postProcessing::processData(int delflag) {
pthread_mutex_unlock(&mg);
//cprintf(RED,"In post processing threads\n");
if(dataReady){
if(dataReady) {
readFrameFromReceiver();
}
}
//only update progress
else{
int caught = -1;

2
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.h
View File

@ -238,7 +238,7 @@ s
void ResetPositionIndex(){pthread_mutex_lock(&mp); resetPositionIndex(); pthread_mutex_unlock(&mp);};
void registerDataCallback(int( *userCallback)(detectorData*, int, int, void*), void *pArg) {dataReady = userCallback; pCallbackArg = pArg;};
void registerDataCallback(int( *userCallback)(detectorData*, int, int, void*), void *pArg) {dataReady = userCallback; pCallbackArg = pArg;enableDataStreamingToClient(1);};
void registerRawDataCallback(int( *userCallback)(double*, int, void*), void *pArg) {rawDataReady = userCallback; pRawDataArg = pArg;};