detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-23 23:10:02 +02:00
Code Issues Actions Packages Releases Activity

socket disconnecting in receiver

Browse Source
This commit is contained in:
Dhanya Maliakal 2015-11-19 11:10:59 +01:00
parent 8b0895add0
commit 291fe8bc22
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -6429,7 +6429,7 @@ int slsDetector::setReceiverTCPSocket(string const name, int const receiver_port
if(checkReceiverOnline().empty()) if(checkReceiverOnline().empty())
retval=FAIL; retval=FAIL;
} else { } else {
thisDetector->receiverOnlineFlag=OFFLINE_FLAG; thisDetector->receiverOnlineFlag=OFFLINE_FLAG;
#ifdef VERBOSE #ifdef VERBOSE
std::cout<< "offline!" << std::endl; std::cout<< "offline!" << std::endl;
#endif #endif

5
slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
View File

@ -452,12 +452,12 @@ void slsDetectorUtils::acquire(int delflag){
executeAction(stopScript); executeAction(stopScript);
} else{ } else{
pthread_mutex_lock(&mg);
#ifdef VERBOSE #ifdef VERBOSE
cout << "findex incremented " << endl; cout << "findex incremented " << endl;
#endif #endif
if(*correctionMask&(1<<WRITE_FILE)) if(*correctionMask&(1<<WRITE_FILE))
IncrementFileIndex(); IncrementFileIndex();
pthread_mutex_lock(&mg);
setFileIndex(fileIO::getFileIndex()); setFileIndex(fileIO::getFileIndex());
pthread_mutex_unlock(&mg); pthread_mutex_unlock(&mg);
@ -465,13 +465,12 @@ void slsDetectorUtils::acquire(int delflag){
} }
pthread_mutex_lock(&mg);
#ifdef VERBOSE #ifdef VERBOSE
cout << "findex incremented " << endl; cout << "findex incremented " << endl;
#endif #endif
if(*correctionMask&(1<<WRITE_FILE)) if(*correctionMask&(1<<WRITE_FILE))
IncrementFileIndex(); IncrementFileIndex();
pthread_mutex_lock(&mg);
setFileIndex(fileIO::getFileIndex()); setFileIndex(fileIO::getFileIndex());
pthread_mutex_unlock(&mg); pthread_mutex_unlock(&mg);

4
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
View File

@ -505,9 +505,7 @@ void* postProcessing::processData(int delflag) {
cout.flush(); cout.flush();
cout<<flush; cout<<flush;
usleep(2000); //2ms need this else connecting error to receiver (too fast?) usleep(20000); //20ms need this else connecting error to receiver (too fast)
//get progress //get progress
if(setReceiverOnline() == ONLINE_FLAG){ if(setReceiverOnline() == ONLINE_FLAG){