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

somewhere

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-10-05 15:27:25 +02:00
parent bf54c15560
commit 09e8bf4144
1 changed files with 10 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

@ -95,12 +95,9 @@ void UDPStandardImplementation::deleteMembers(){
if(threadStarted){ if(threadStarted){
createListeningThreads(true); createListeningThreads(true);
createWriterThreads(true); createWriterThreads(true);
threadStarted = false;
} }
if(zmqThreadStarted){ if(zmqThreadStarted)
createDataCallbackThreads(true); createDataCallbackThreads(true);
zmqThreadStarted = false;
}
} }
void UDPStandardImplementation::deleteFilter(){ void UDPStandardImplementation::deleteFilter(){
@ -338,7 +335,6 @@ int UDPStandardImplementation::setupFifoStructure(){
if(threadStarted){ if(threadStarted){
createListeningThreads(true); createListeningThreads(true);
createWriterThreads(true); createWriterThreads(true);
threadStarted = false;
} }
@ -456,16 +452,6 @@ void UDPStandardImplementation::setFileName(const char c[]){
detID = 0; detID = 0;
} }
if(dataStreamEnable && (strcmp(oldfilename,fileName))){
if(zmqThreadStarted)
createDataCallbackThreads(true);
numberofDataCallbackThreads = MAX_NUMBER_OF_LISTENING_THREADS;
if(createDataCallbackThreads() == FAIL){
cprintf(BG_RED,"Error: Could not create data callback threads\n");
}
}
FILE_LOG(logINFO) << "File name:" << fileName; FILE_LOG(logINFO) << "File name:" << fileName;
} }
@ -576,21 +562,17 @@ int UDPStandardImplementation::setFrameToGuiFrequency(const uint32_t freq){
uint32_t UDPStandardImplementation::setDataStreamEnable(const uint32_t enable){ uint32_t UDPStandardImplementation::setDataStreamEnable(const uint32_t enable){
FILE_LOG(logDEBUG) << __AT__ << " called"; FILE_LOG(logDEBUG) << __AT__ << " called";
int olddatasend = dataStreamEnable;
dataStreamEnable = enable; dataStreamEnable = enable;
FILE_LOG(logINFO) << "Data Send to Gui: " << dataStreamEnable; FILE_LOG(logINFO) << "Data Send to Gui: " << dataStreamEnable;
//if there is a change //data sockets have to be created again as the client ones are
if(olddatasend != dataStreamEnable){ if(zmqThreadStarted)
if(zmqThreadStarted) createDataCallbackThreads(true);
createDataCallbackThreads(true);
if(dataStreamEnable){ if(dataStreamEnable){
numberofDataCallbackThreads = MAX_NUMBER_OF_LISTENING_THREADS; numberofDataCallbackThreads = MAX_NUMBER_OF_LISTENING_THREADS;
if(createDataCallbackThreads() == FAIL){ if(createDataCallbackThreads() == FAIL){
cprintf(BG_RED,"Error: Could not create data callback threads\n"); cprintf(BG_RED,"Error: Could not create data callback threads\n");
}
} }
} }
@ -1690,7 +1672,8 @@ void UDPStandardImplementation::startDataCallback(){
switch(myDetectorType){ switch(myDetectorType){
case EIGER: case EIGER:
headersize = EIGER_HEADER_SIZE; break; headersize = EIGER_HEADER_SIZE; break;
default:
headersize = 0; break;
} }