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

merge conflict resolved

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-12-01 12:44:34 +01:00
parent 0e26734023 d1e3d50a87
commit 9f152ce1f3
10 changed files with 98 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

@ -191,7 +191,7 @@ int UDPStandardImplementation::setShortFrameEnable(const int i) {
for (vector<DataStreamer*>::const_iterator it = dataStreamer.begin(); it != dataStreamer.end(); ++it)
(*it)->SetGeneralData(generalData);
}
FILE_LOG (logINFO) << "Short Frame Enable: " << shortFrameEnable;
FILE_LOG(logINFO) << "Short Frame Enable: " << shortFrameEnable;
return OK;
}
@ -200,7 +200,7 @@ int UDPStandardImplementation::setFrameToGuiFrequency(const uint32_t freq) {
if (frameToGuiFrequency != freq) {
frameToGuiFrequency = freq;
}
FILE_LOG (logINFO) << "Frame to Gui Frequency: " << frameToGuiFrequency;
FILE_LOG(logINFO) << "Frame to Gui Frequency: " << frameToGuiFrequency;
return OK;
}
@ -239,7 +239,7 @@ int UDPStandardImplementation::setDataStreamEnable(const bool enable) {
SetThreadPriorities();
}
}
FILE_LOG (logINFO) << "Data Send to Gui: " << dataStreamEnable;
FILE_LOG(logINFO) << "Data Send to Gui: " << dataStreamEnable;
return OK;
}
@ -275,7 +275,7 @@ int UDPStandardImplementation::setDynamicRange(const uint32_t i) {
if (SetupFifoStructure() == FAIL)
return FAIL;
}
FILE_LOG (logINFO) << "Dynamic Range: " << dynamicRange;
FILE_LOG(logINFO) << "Dynamic Range: " << dynamicRange;
return OK;
}
@ -290,7 +290,7 @@ int UDPStandardImplementation::setTenGigaEnable(const bool b) {
if (SetupFifoStructure() == FAIL)
return FAIL;
}
FILE_LOG (logINFO) << "Ten Giga: " << stringEnable(tengigaEnable);
FILE_LOG(logINFO) << "Ten Giga: " << stringEnable(tengigaEnable);
return OK;
}
@ -303,7 +303,7 @@ int UDPStandardImplementation::setFifoDepth(const uint32_t i) {
if (SetupFifoStructure() == FAIL)
return FAIL;
}
FILE_LOG (logINFO) << "Fifo Depth: " << i;
FILE_LOG(logINFO) << "Fifo Depth: " << i;
return OK;
}
@ -320,7 +320,7 @@ void UDPStandardImplementation::setSilentMode(const uint32_t i){
int UDPStandardImplementation::setDetectorType(const detectorType d) {
FILE_LOG (logDEBUG) << "Setting receiver type";
FILE_LOG(logDEBUG) << "Setting receiver type";
DeleteMembers();
InitializeMembers();
myDetectorType = d;
@ -331,10 +331,10 @@ int UDPStandardImplementation::setDetectorType(const detectorType d) {
case EIGER:
case JUNGFRAUCTB:
case JUNGFRAU:
FILE_LOG (logINFO) << " ***** " << getDetectorType(d) << " Receiver *****";
FILE_LOG(logINFO) << " ***** " << getDetectorType(d) << " Receiver *****";
break;
default:
FILE_LOG (logERROR) << "This is an unknown receiver type " << (int)d;
FILE_LOG(logERROR) << "This is an unknown receiver type " << (int)d;
return FAIL;
}
@ -358,7 +358,7 @@ int UDPStandardImplementation::setDetectorType(const detectorType d) {
//create fifo structure
numberofJobs = -1;
if (SetupFifoStructure() == FAIL) {
FILE_LOG (logERROR) << "Error: Could not allocate memory for fifo structure";
FILE_LOG(logERROR) << "Could not allocate memory for fifo structure";
return FAIL;
}
@ -369,7 +369,7 @@ int UDPStandardImplementation::setDetectorType(const detectorType d) {
fileWriteEnable, &dataStreamEnable, &gapPixelsEnable, &dynamicRange, &frameToGuiFrequency, &frameToGuiTimerinMS,
rawDataReadyCallBack,pRawDataReady));
if (Listener::GetErrorMask() || DataProcessor::GetErrorMask()) {
FILE_LOG (logERROR) << "Error: Could not creates listener/dataprocessor threads (index:" << i << ")";
FILE_LOG(logERROR) << "Could not create listener/dataprocessor threads (index:" << i << ")";
for (vector<Listener*>::const_iterator it = listener.begin(); it != listener.end(); ++it)
delete(*it);
listener.clear();
@ -388,7 +388,7 @@ int UDPStandardImplementation::setDetectorType(const detectorType d) {
SetThreadPriorities();
FILE_LOG (logDEBUG) << " Detector type set to " << getDetectorType(d);
FILE_LOG(logDEBUG) << " Detector type set to " << getDetectorType(d);
return OK;
}
@ -416,7 +416,7 @@ void UDPStandardImplementation::resetAcquisitionCount() {
for (vector<DataStreamer*>::const_iterator it = dataStreamer.begin(); it != dataStreamer.end(); ++it)
(*it)->ResetParametersforNewAcquisition();
FILE_LOG (logINFO) << "Acquisition Count has been reset";
FILE_LOG(logINFO) << "Acquisition Count has been reset";
}
@ -626,19 +626,19 @@ void UDPStandardImplementation::SetLocalNetworkParameters() {
//to increase Socket Receiver Buffer size
sprintf(command,"echo $((%d)) > /proc/sys/net/core/rmem_max",RECEIVE_SOCKET_BUFFER_SIZE);
if (system(command)) {
FILE_LOG (logWARNING) << "No root privileges to change Socket Receiver Buffer size (net.core.rmem_max)";
FILE_LOG(logWARNING) << "No root privileges to change Socket Receiver Buffer size (net.core.rmem_max)";
return;
}
FILE_LOG (logINFO) << "Socket Receiver Buffer size (/proc/sys/net/core/rmem_max) modified to " << RECEIVE_SOCKET_BUFFER_SIZE ;
FILE_LOG(logINFO) << "Socket Receiver Buffer size (/proc/sys/net/core/rmem_max) modified to " << RECEIVE_SOCKET_BUFFER_SIZE ;
// to increase Max length of input packet queue
sprintf(command,"echo %d > /proc/sys/net/core/netdev_max_backlog",MAX_SOCKET_INPUT_PACKET_QUEUE);
if (system(command)) {
FILE_LOG (logWARNING) << "No root privileges to change Max length of input packet queue (net.core.rmem_max)";
FILE_LOG(logWARNING) << "No root privileges to change Max length of input packet queue (net.core.rmem_max)";
return;
}
FILE_LOG (logINFO) << "Max length of input packet queue (/proc/sys/net/core/netdev_max_backlog) modified to " << MAX_SOCKET_INPUT_PACKET_QUEUE ;
FILE_LOG(logINFO) << "Max length of input packet queue (/proc/sys/net/core/netdev_max_backlog) modified to " << MAX_SOCKET_INPUT_PACKET_QUEUE ;
}
@ -685,8 +685,8 @@ int UDPStandardImplementation::SetupFifoStructure() {
if(dataStreamer.size())dataStreamer[i]->SetFifo(fifo[i]);
}
FILE_LOG (logINFO) << "Memory Allocated Per Fifo: " << ( ((generalData->imageSize) * numberofJobs + (generalData->fifoBufferHeaderSize)) * fifoDepth) << " bytes" ;
FILE_LOG (logINFO) << " Fifo structure(s) reconstructed: " << numThreads;
FILE_LOG(logINFO) << "Memory Allocated Per Fifo: " << ( ((generalData->imageSize) * numberofJobs + (generalData->fifoBufferHeaderSize)) * fifoDepth) << " bytes" ;
FILE_LOG(logINFO) << " Fifo structure(s) reconstructed: " << numThreads;
return OK;
}