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

solved warnings except sscanf for uint64_t

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-04-07 14:12:21 +02:00
parent cacb4c9d93
commit f7d85231f2
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
slsReceiverSoftware/include/logger.h
View File

@ -7,16 +7,13 @@
#include <unistd.h> #include <unistd.h>
#include <ansi.h> #include <ansi.h>
#ifdef VERBOSE
#define FILELOG_MAX_LEVEL logDEBUG
#endif
#ifdef VERYVERBOSE
#define FILELOG_MAX_LEVEL logDEBUG4
#endif
#ifdef FIFODEBUG #ifdef FIFODEBUG
#define FILELOG_MAX_LEVEL logDEBUG5 #define FILELOG_MAX_LEVEL logDEBUG5
#elif VERYVERBOSE
#define FILELOG_MAX_LEVEL logDEBUG4
#elif VERBOSE
#define FILELOG_MAX_LEVEL logDEBUG
#endif #endif
#ifndef FILELOG_MAX_LEVEL #ifndef FILELOG_MAX_LEVEL

12
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

@ -20,6 +20,7 @@
#include <zmq.h> //zmq #include <zmq.h> //zmq
#include <sstream> #include <sstream>
#include <inttypes.h> //printf of uint64_t etc
using namespace std; using namespace std;
@ -1531,11 +1532,12 @@ int UDPStandardImplementation::setupWriter(){
tempname=tempname.substr(0,uscore); tempname=tempname.substr(0,uscore);
startAcquisitionCallBack(filePath, (char*)tempname.c_str(),fileIndex, (uint32_t)bufferSize,pStartAcquisition); startAcquisitionCallBack(filePath, (char*)tempname.c_str(),fileIndex, (uint32_t)bufferSize,pStartAcquisition);
} }
if (rawDataReadyCallBack) if (rawDataReadyCallBack) {
FILE_LOG(logINFO) << "Data Write has been defined externally"; FILE_LOG(logINFO) << "Data Write has been defined externally";
if (!fileWriteEnable) }
if (!fileWriteEnable) {
FILE_LOG(logINFO) << "Data will not be saved"; FILE_LOG(logINFO) << "Data will not be saved";
}
//creating first file //creating first file
@ -2346,7 +2348,7 @@ int UDPStandardImplementation::prepareAndListenBufferCompleteFrames(int ithread)
#ifdef VERBOSE #ifdef VERBOSE
if(!ithread) if(!ithread)
cprintf(BLUE, cprintf(BLUE,
"framenumber:%llu\tsubfnum:%u\tpnum:%u\tbunchid:%llu\txcoord:%u\tdettype:%u\tversion:%u\n", "framenumber:%lu\tsubfnum:%u\tpnum:%u\tbunchid:%lu\txcoord:%u\tdettype:%u\tversion:%u\n",
header->frameNumber, header->expLength, header->packetNumber, header->frameNumber, header->expLength, header->packetNumber,
header->bunchId, header->xCoord, header->detType, header->version); header->bunchId, header->xCoord, header->detType, header->version);
#endif #endif
@ -3325,7 +3327,7 @@ void UDPStandardImplementation::handleDataCompression(int ithread, char* wbuffer
break; break;
} }
while(buff[0] = receiverData[ithread]->findNextFrame(data,ndata,remainingsize)){ while((buff[0] = receiverData[ithread]->findNextFrame(data,ndata,remainingsize))){
//remaining number of packets //remaining number of packets
np = ndata/onePacketSize; np = ndata/onePacketSize;