From 40c96b5562f4de67cbd71741ea545cb8ea140fee Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 18 Jul 2018 12:29:19 +0200 Subject: [PATCH] Updated Makefiles, Cmakelists.txt to compile slsMultiReceiver properly and with HDF5 and fixed compiler warnings --- CMakeLists.txt | 2 +- Makefile | 3 ++ manual/manual-api/CMakeLists.txt | 32 +++++++++++++++---- manual/manual-api/Makefile | 28 ++++++++++------ manual/manual-api/ansi.h | 1 - manual/manual-api/detectorData.h | 1 - manual/manual-api/libSlsDetector.so | 1 - manual/manual-api/libSlsReceiver.so | 1 - manual/manual-api/libzmq.a | 1 - manual/manual-api/mainReceiver.cpp | 16 +++++----- manual/manual-api/slsDetectorUsers.h | 1 - manual/manual-api/slsReceiverUsers.h | 1 - manual/manual-api/sls_receiver_defs.h | 1 - manual/manual-api/sls_receiver_funcs.h | 1 - manual/manual-api/zmq.h | 1 - slsDetectorGui/gitInfo.txt | 10 +++--- slsDetectorGui/include/gitInfoGui.h | 8 ++--- slsDetectorSoftware/gitInfo.txt | 8 ++--- .../multiSlsDetector/multiSlsDetector.cpp | 2 +- slsDetectorSoftware/slsDetector/gitInfoLib.h | 6 ++-- .../slsDetectorClient/Makefile | 2 +- slsReceiverSoftware/gitInfo.txt | 10 +++--- slsReceiverSoftware/include/HDF5FileStatic.h | 12 +++---- slsReceiverSoftware/include/gitInfoReceiver.h | 8 ++--- slsReceiverSoftware/src/DataProcessor.cpp | 2 +- slsReceiverSoftware/src/HDF5File.cpp | 7 ++-- .../src/UDPStandardImplementation.cpp | 1 - .../src/slsReceiverTCPIPInterface.cpp | 8 +++-- 28 files changed, 99 insertions(+), 76 deletions(-) delete mode 120000 manual/manual-api/ansi.h delete mode 120000 manual/manual-api/detectorData.h delete mode 120000 manual/manual-api/libSlsDetector.so delete mode 120000 manual/manual-api/libSlsReceiver.so delete mode 120000 manual/manual-api/libzmq.a delete mode 120000 manual/manual-api/slsDetectorUsers.h delete mode 120000 manual/manual-api/slsReceiverUsers.h delete mode 120000 manual/manual-api/sls_receiver_defs.h delete mode 120000 manual/manual-api/sls_receiver_funcs.h delete mode 120000 manual/manual-api/zmq.h diff --git a/CMakeLists.txt b/CMakeLists.txt index ba2614716..d7e432b13 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ option (USE_GUI "GUI" OFF) if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++98 -Wno-misleading-indentation") else () - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++98") endif () find_package(Qt4) diff --git a/Makefile b/Makefile index 9d6ae560d..8d4849b75 100755 --- a/Makefile +++ b/Makefile @@ -19,6 +19,7 @@ RECEIVERDIR = $(LIBRARYRXRDIR) CALWIZDIR = $(WD)/calibrationWizards MANDIR = $(WD)/manual CALIBDIR = $(WD)/slsDetectorCalibration +MANAPIDIR = $(MANDIR)/manual-api TABSPACE := "\t" @@ -79,6 +80,7 @@ slsReceiver_static: receiver receiver: #libreceiver # cd $(RECEIVERDIR) && $(MAKE) receiver FLAGS='$(FLAGS)' DESTDIR='$(BINDIR)' LIBS='$(LDFLAGRXR)' INCLUDES='$(INCLUDESRXR)' LIBDIR='$(LIBDIR)' cd $(RECEIVERDIR) && $(MAKE) FLAGS='$(FLAGS)' DESTDIR='$(BINDIR)' LIBS='$(LDFLAGRXR)' INCLUDES='$(INCLUDESRXR)' LIBDIR='$(LIBDIR)' + cd $(MANAPIDIR) && $(MAKE) slsMultiReceiver @echo "" @echo "#######################################" @echo "# Back in slsDetectorPackage Makefile #" @@ -151,6 +153,7 @@ clean: cd $(DOCDIR) && rm -rf * rm -rf slsDetectorPackageDocs; rm -rf $(DETAILDOC) + rm -rf $(MANAPIDIR)/slsMultiReceiver #install_lib: diff --git a/manual/manual-api/CMakeLists.txt b/manual/manual-api/CMakeLists.txt index 247fae56e..0f7841626 100644 --- a/manual/manual-api/CMakeLists.txt +++ b/manual/manual-api/CMakeLists.txt @@ -1,17 +1,35 @@ - -add_executable(slsMultiReceiver +set(SOURCES mainReceiver.cpp ) -set_target_properties(slsMultiReceiver PROPERTIES - RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin + +include_directories( + ../../slsReceiverSoftware/include + ../../slsDetectorSoftware/slsDetectorAnalysis + ../../build/bin + ../../slsdetectorSoftware/slsDetector ) + +add_executable(slsMultiReceiver + ${SOURCES} +) + target_link_libraries(slsMultiReceiver slsReceiverShared pthread zmq rt + ${HDF5_LIBRARIES} ) -install(TARGETS slsMultiReceiver - RUNTIME DESTINATION bin) - \ No newline at end of file +if (HDF5_FOUND) + target_link_libraries(slsMultiReceiver + ${HDF5_LIBRARIES} + ) +endif () + + +set_target_properties(slsMultiReceiver PROPERTIES + RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin +) + +install(TARGETS slsMultiReceiver DESTINATION bin) diff --git a/manual/manual-api/Makefile b/manual/manual-api/Makefile index 3603e6ae8..d1cc82e02 100644 --- a/manual/manual-api/Makefile +++ b/manual/manual-api/Makefile @@ -1,13 +1,21 @@ -INCLUDES = -I . +PKGDIR = ../.. +LIBDIR = $(PKGDIR)/bin +INCLUDES = -I . -I$(PKGDIR)/slsReceiverSoftware/include -I$(PKGDIR)/slsDetectorSoftware/slsDetectorAnalysis -I$(LIBDIR) -I$(PKGDIR)/slsdetectorSoftware/slsDetector SRC_DET = mainClient.cpp SRC_REC = mainReceiver.cpp -LIBDIR = . -LDFLAG_DET = -I. -L$(LIBDIR) -lSlsDetector -L/usr/lib64/ -pthread -lrt -L. -lzmq -LDFLAG_REC = -I. -L$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -pthread -lrt -L. -lzmq +ZMQLIBDIR = $(PKGDIR)/slsReceiverSoftware/include +LDFLAG_DET = -I. -L$(LIBDIR) -Wl,-rpath=$(LIBDIR) -lSlsDetector -L/usr/lib64/ -pthread -lrt -L$(ZMQLIBDIR) -Wl,-rpath=$(ZMQLIBDIR) -lzmq +LDFLAG_REC = -I. -L$(LIBDIR) -Wl,-rpath=$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -pthread -lrt -L$(ZMQLIBDIR) -Wl,-rpath=$(ZMQLIBDIR) -lzmq DESTDIR ?= ../docs +HDF5 ?= no +HDF5_DIR ?= /opt/hdf5v1.10.0 -all: docs detUser detReceiver +ifeq ($(HDF5),yes) + LDFLAG_REC += -L$(HDF5_DIR)/lib -Wl,-rpath=$(HDF5_DIR)/lib -lhdf5 -lhdf5_cpp -lsz -lz -DHDF5C +endif + +all: docs detUser slsMultiReceiver #all: docs docs: createdocs docspdf docshtml removedocs @@ -35,18 +43,20 @@ detUser:$(SRC_DET) mkdir -p bin g++ -o bin/detUser $(SRC_DET) $(INCLUDES) $(LDFLAG_DET) -lm -lstdc++ -detReceiver:$(SRC_REC) +slsMultiReceiver:$(SRC_REC) echo "creating receiver" + echo $LDFLAG_REC mkdir -p bin - g++ -o bin/detReceiver $(SRC_REC) $(INCLUDES) $(LDFLAG_REC) -lm -lstdc++ - + g++ -o bin/slsMultiReceiver $(SRC_REC) $(INCLUDES) $(LDFLAG_REC) -lm -lstdc++ + cp bin/slsMultiReceiver $(LIBDIR) clean: echo "cleaning for manual-api" - rm -rf bin/detUser bin/detReceiver slsDetectorUsersDocs + rm -rf bin/detUser bin/slsMultiReceiver bin/detReceiver slsDetectorUsersDocs rm -rf slsDetectorUsersDocs rm -rf $(DESTDIR)/html/slsDetectorUsersDocs rm -rf $(DESTDIR)/pdf/slsDetectorUsersDocs.pdf + rm -rf $(LIBDIR)/slsMultiReceiver diff --git a/manual/manual-api/ansi.h b/manual/manual-api/ansi.h deleted file mode 120000 index a122db0ad..000000000 --- a/manual/manual-api/ansi.h +++ /dev/null @@ -1 +0,0 @@ -../../slsReceiverSoftware/include/ansi.h \ No newline at end of file diff --git a/manual/manual-api/detectorData.h b/manual/manual-api/detectorData.h deleted file mode 120000 index a9649d01f..000000000 --- a/manual/manual-api/detectorData.h +++ /dev/null @@ -1 +0,0 @@ -../../slsDetectorSoftware/slsDetectorAnalysis/detectorData.h \ No newline at end of file diff --git a/manual/manual-api/libSlsDetector.so b/manual/manual-api/libSlsDetector.so deleted file mode 120000 index ca5cf8fcb..000000000 --- a/manual/manual-api/libSlsDetector.so +++ /dev/null @@ -1 +0,0 @@ -../../build/bin/libSlsDetector.so \ No newline at end of file diff --git a/manual/manual-api/libSlsReceiver.so b/manual/manual-api/libSlsReceiver.so deleted file mode 120000 index e2419f9cb..000000000 --- a/manual/manual-api/libSlsReceiver.so +++ /dev/null @@ -1 +0,0 @@ -../../build/bin/libSlsReceiver.so \ No newline at end of file diff --git a/manual/manual-api/libzmq.a b/manual/manual-api/libzmq.a deleted file mode 120000 index 2ecd6f21c..000000000 --- a/manual/manual-api/libzmq.a +++ /dev/null @@ -1 +0,0 @@ -../../slsReceiverSoftware/include/libzmq.a \ No newline at end of file diff --git a/manual/manual-api/mainReceiver.cpp b/manual/manual-api/mainReceiver.cpp index 2e8ece10e..fcc5620fe 100644 --- a/manual/manual-api/mainReceiver.cpp +++ b/manual/manual-api/mainReceiver.cpp @@ -71,7 +71,7 @@ void printHelp() { */ int StartAcq(char* filepath, char* filename, uint64_t fileindex, uint32_t datasize, void*p){ cprintf(BLUE, "#### StartAcq: filepath:%s filename:%s fileindex:%llu datasize:%u ####\n", - filepath, filename, fileindex, datasize); + filepath, filename, (long long unsigned int)fileindex, datasize); cprintf(BLUE, "--StartAcq: returning 0\n"); return 0; @@ -83,7 +83,7 @@ int StartAcq(char* filepath, char* filename, uint64_t fileindex, uint32_t datasi * @param p pointer to object */ void AcquisitionFinished(uint64_t frames, void*p){ - cprintf(BLUE, "#### AcquisitionFinished: frames:%llu ####\n",frames); + cprintf(BLUE, "#### AcquisitionFinished: frames:%llu ####\n",(long long unsigned int)frames); } @@ -107,9 +107,9 @@ void GetData(char* metadata, char* datapointer, uint32_t datasize, void* p){ "\t\troundRNumber: %u\t\tdetType: %u\t\tversion: %u" //"\t\tpacketsMask:%s" "\t\tfirstbytedata: 0x%x\t\tdatsize: %u\n\n", - detectorHeader.xCoord, detectorHeader.frameNumber, - detectorHeader.expLength, detectorHeader.packetNumber, detectorHeader.bunchId, - detectorHeader.timestamp, detectorHeader.modId, + detectorHeader.xCoord, (long long unsigned int)detectorHeader.frameNumber, + detectorHeader.expLength, detectorHeader.packetNumber, (long long unsigned int)detectorHeader.bunchId, + (long long unsigned int)detectorHeader.timestamp, detectorHeader.modId, detectorHeader.xCoord, detectorHeader.yCoord, detectorHeader.zCoord, detectorHeader.debug, detectorHeader.roundRNumber, detectorHeader.detType, detectorHeader.version, @@ -141,9 +141,9 @@ void GetData(char* metadata, char* datapointer, uint32_t &revDatasize, void* p){ "\t\troundRNumber: %u\t\tdetType: %u\t\tversion: %u" //"\t\tpacketsMask:%s" "\t\tfirstbytedata: 0x%x\t\tdatsize: %u\n\n", - detectorHeader.xCoord, detectorHeader.frameNumber, - detectorHeader.expLength, detectorHeader.packetNumber, detectorHeader.bunchId, - detectorHeader.timestamp, detectorHeader.modId, + detectorHeader.xCoord, (long long unsigned int)detectorHeader.frameNumber, + detectorHeader.expLength, detectorHeader.packetNumber, (long long unsigned int)detectorHeader.bunchId, + (long long unsigned int)detectorHeader.timestamp, detectorHeader.modId, detectorHeader.xCoord, detectorHeader.yCoord, detectorHeader.zCoord, detectorHeader.debug, detectorHeader.roundRNumber, detectorHeader.detType, detectorHeader.version, diff --git a/manual/manual-api/slsDetectorUsers.h b/manual/manual-api/slsDetectorUsers.h deleted file mode 120000 index 307c966ad..000000000 --- a/manual/manual-api/slsDetectorUsers.h +++ /dev/null @@ -1 +0,0 @@ -../../slsDetectorSoftware/slsDetector/slsDetectorUsers.h \ No newline at end of file diff --git a/manual/manual-api/slsReceiverUsers.h b/manual/manual-api/slsReceiverUsers.h deleted file mode 120000 index c8727f200..000000000 --- a/manual/manual-api/slsReceiverUsers.h +++ /dev/null @@ -1 +0,0 @@ -../../slsReceiverSoftware/include/slsReceiverUsers.h \ No newline at end of file diff --git a/manual/manual-api/sls_receiver_defs.h b/manual/manual-api/sls_receiver_defs.h deleted file mode 120000 index 1de31caf5..000000000 --- a/manual/manual-api/sls_receiver_defs.h +++ /dev/null @@ -1 +0,0 @@ -../../slsReceiverSoftware/include/sls_receiver_defs.h \ No newline at end of file diff --git a/manual/manual-api/sls_receiver_funcs.h b/manual/manual-api/sls_receiver_funcs.h deleted file mode 120000 index c2ea4ded9..000000000 --- a/manual/manual-api/sls_receiver_funcs.h +++ /dev/null @@ -1 +0,0 @@ -../../slsReceiverSoftware/include/sls_receiver_funcs.h \ No newline at end of file diff --git a/manual/manual-api/zmq.h b/manual/manual-api/zmq.h deleted file mode 120000 index f2002f1d8..000000000 --- a/manual/manual-api/zmq.h +++ /dev/null @@ -1 +0,0 @@ -../../slsReceiverSoftware/include/zmq.h \ No newline at end of file diff --git a/slsDetectorGui/gitInfo.txt b/slsDetectorGui/gitInfo.txt index 4e2bb5792..2ca43a76e 100644 --- a/slsDetectorGui/gitInfo.txt +++ b/slsDetectorGui/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorGui URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: 51fd9ed423b7a8fb45a76b4f48316537c4fb0f5d -Revision: 505 -Branch: developer +Repsitory UUID: 6bb7195a2c7dc9526088882e0244a7455d3c15b2 +Revision: 511 +Branch: 3.3.0-rc Last Changed Author: Dhanya_Thattil -Last Changed Rev: 3818 -Last Changed Date: 2018-05-15 13:48:54.000000002 +0200 ./src/qTabSettings.cpp +Last Changed Rev: 3941 +Last Changed Date: 2018-07-17 16:15:43.000000002 +0200 ./src/qTabSettings.cpp diff --git a/slsDetectorGui/include/gitInfoGui.h b/slsDetectorGui/include/gitInfoGui.h index f57d0eb74..40b2a1e3c 100644 --- a/slsDetectorGui/include/gitInfoGui.h +++ b/slsDetectorGui/include/gitInfoGui.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "51fd9ed423b7a8fb45a76b4f48316537c4fb0f5d" +#define GITREPUUID "6bb7195a2c7dc9526088882e0244a7455d3c15b2" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x3818 -#define GITDATE 0x20180515 -#define GITBRANCH "developer" +#define GITREV 0x3941 +#define GITDATE 0x20180717 +#define GITBRANCH "3.3.0-rc" diff --git a/slsDetectorSoftware/gitInfo.txt b/slsDetectorSoftware/gitInfo.txt index 78a7d7d63..5e03ab8bc 100644 --- a/slsDetectorSoftware/gitInfo.txt +++ b/slsDetectorSoftware/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: f5a86bbfe1e4d0ec5e9296b84a3e1096fdc4a9a6 -Revision: 1990 +Repsitory UUID: 6bb7195a2c7dc9526088882e0244a7455d3c15b2 +Revision: 1992 Branch: 3.3.0-rc Last Changed Author: Dhanya_Thattil -Last Changed Rev: 3938 -Last Changed Date: 2018-07-10 14:45:56.000000002 +0200 ./multiSlsDetector/multiSlsDetector.cpp +Last Changed Rev: 3941 +Last Changed Date: 2018-07-18 12:26:21.000000002 +0200 ./threadFiles/ThreadPool.o diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index 6cf6ef74b..ff1030324 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -4908,7 +4908,7 @@ void multiSlsDetector::readFrameFromReceiver() { memset(multiframe, 0xFF, multisize); //get each frame - for (int isocket = 0; isocket < zmqSocket.size(); ++isocket) { + for (unsigned int isocket = 0; isocket < zmqSocket.size(); ++isocket) { //if running if (runningList[isocket]) { diff --git a/slsDetectorSoftware/slsDetector/gitInfoLib.h b/slsDetectorSoftware/slsDetector/gitInfoLib.h index 5cb0b0bd6..219fb2199 100644 --- a/slsDetectorSoftware/slsDetector/gitInfoLib.h +++ b/slsDetectorSoftware/slsDetector/gitInfoLib.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "f5a86bbfe1e4d0ec5e9296b84a3e1096fdc4a9a6" +#define GITREPUUID "6bb7195a2c7dc9526088882e0244a7455d3c15b2" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x3938 -#define GITDATE 0x20180710 +#define GITREV 0x3941 +#define GITDATE 0x20180718 #define GITBRANCH "3.3.0-rc" diff --git a/slsDetectorSoftware/slsDetectorClient/Makefile b/slsDetectorSoftware/slsDetectorClient/Makefile index 44ccbf7e4..9c26be641 100644 --- a/slsDetectorSoftware/slsDetectorClient/Makefile +++ b/slsDetectorSoftware/slsDetectorClient/Makefile @@ -105,7 +105,7 @@ htmldoc: clean: # cd manual && make clean - rm -rf $(BIN)/sls_detector_put $(BIN)/sls_detector_get $(BIN)/sls_detector_acquire $(BIN)/sls_detector_help + rm -rf $(BIN)/sls_detector_put $(BIN)/sls_detector_get $(BIN)/sls_detector_acquire $(BIN)/sls_detector_help $(BIN)/gui_client install: clients diff --git a/slsReceiverSoftware/gitInfo.txt b/slsReceiverSoftware/gitInfo.txt index 7101a2cc5..176ad8c05 100644 --- a/slsReceiverSoftware/gitInfo.txt +++ b/slsReceiverSoftware/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsReceiverSoftware URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: 51fd9ed423b7a8fb45a76b4f48316537c4fb0f5d -Revision: 791 -Branch: developer +Repsitory UUID: 6bb7195a2c7dc9526088882e0244a7455d3c15b2 +Revision: 809 +Branch: 3.3.0-rc Last Changed Author: Dhanya_Thattil -Last Changed Rev: 3818 -Last Changed Date: 2018-05-17 09:23:53.000000002 +0200 ./include/HDF5FileStatic.h +Last Changed Rev: 3941 +Last Changed Date: 2018-07-18 12:11:38.000000002 +0200 ./include/HDF5FileStatic.h diff --git a/slsReceiverSoftware/include/HDF5FileStatic.h b/slsReceiverSoftware/include/HDF5FileStatic.h index b5c170bd0..e1ee42a5e 100644 --- a/slsReceiverSoftware/include/HDF5FileStatic.h +++ b/slsReceiverSoftware/include/HDF5FileStatic.h @@ -442,7 +442,7 @@ public: //create parameter datasets hsize_t dims[1] = {nDimx}; dspace_para = new DataSpace (1,dims); - for (int i = 0; i < parameterNames.size(); ++i){ + for (unsigned int i = 0; i < parameterNames.size(); ++i){ DataSet* ds = new DataSet(fd->createDataSet(parameterNames[i], parameterDataTypes[i], *dspace_para)); dset_para.push_back(ds); } @@ -525,7 +525,7 @@ public: hid_t vdsDataspace = H5Screate_simple(3, vdsdims ,NULL); if (vdsDataspace < 0) return CloseFileOnError(fd, string("Error in creating virtual dataspace in virtual file ") + virtualFileName + string("\n")); - hsize_t vdsdims_para[2] = {numf, numDety * numDetz}; + hsize_t vdsdims_para[2] = {numf, (unsigned int) numDety * numDetz}; hid_t vdsDataspace_para = H5Screate_simple(2, vdsdims_para, NULL); if (vdsDataspace_para < 0) return CloseFileOnError(fd, string("Error in creating virtual dataspace (parameters) in virtual file ") + virtualFileName + string("\n")); @@ -539,7 +539,7 @@ public: if (H5Pset_fill_value (dcpl, GetDataTypeinC(dataType), &fill_value) < 0) return CloseFileOnError(fd, string("Error in creating fill value in virtual file ") + virtualFileName + string("\n")); hid_t dcpl_para[parameterNames.size()]; - for (int i = 0; i < parameterNames.size(); ++i) { + for (unsigned int i = 0; i < parameterNames.size(); ++i) { dcpl_para[i] = H5Pcreate (H5P_DATASET_CREATE); if (dcpl_para[i] < 0) return CloseFileOnError(fd, string("Error in creating file creation properties (parameters) in virtual file ") + virtualFileName + string("\n")); @@ -609,7 +609,7 @@ public: break; } - for (int k = 0; k < parameterNames.size(); ++k) { + for (unsigned int k = 0; k < parameterNames.size(); ++k) { if (H5Pset_virtual(dcpl_para[k], vdsDataspace_para, relative_srcFileName.c_str(), parameterNames[k], srcDataspace_para) < 0) { cprintf(RED,"could not set mapping for paramter %d\n", k); error = true; @@ -639,7 +639,7 @@ public: //virtual parameter dataset - for (int i = 0; i < parameterNames.size(); ++i) { + for (unsigned int i = 0; i < parameterNames.size(); ++i) { hid_t vdsdataset_para = H5Dcreate2 (fd, (string("/virtual_") + string (parameterNames[i])).c_str(), GetDataTypeinC(parameterDataTypes[i]), vdsDataspace_para, H5P_DEFAULT, dcpl_para[i], H5P_DEFAULT); @@ -813,7 +813,7 @@ public: H5Dclose(vdset); //**paramter datasets** - for (int i = 0; i < parameterNames.size(); ++i){ + for (unsigned int i = 0; i < parameterNames.size(); ++i){ hid_t vdset_para = H5Dopen2( vfd, (string("/virtual_") + string (parameterNames[i])).c_str(), H5P_DEFAULT); if (vdset_para < 0) { H5Fclose(mfd); mfd = 0; diff --git a/slsReceiverSoftware/include/gitInfoReceiver.h b/slsReceiverSoftware/include/gitInfoReceiver.h index 315130b93..219fb2199 100644 --- a/slsReceiverSoftware/include/gitInfoReceiver.h +++ b/slsReceiverSoftware/include/gitInfoReceiver.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "51fd9ed423b7a8fb45a76b4f48316537c4fb0f5d" +#define GITREPUUID "6bb7195a2c7dc9526088882e0244a7455d3c15b2" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x3818 -#define GITDATE 0x20180517 -#define GITBRANCH "developer" +#define GITREV 0x3941 +#define GITDATE 0x20180718 +#define GITBRANCH "3.3.0-rc" diff --git a/slsReceiverSoftware/src/DataProcessor.cpp b/slsReceiverSoftware/src/DataProcessor.cpp index a57c9d4e1..d7bbe28eb 100644 --- a/slsReceiverSoftware/src/DataProcessor.cpp +++ b/slsReceiverSoftware/src/DataProcessor.cpp @@ -481,7 +481,7 @@ void DataProcessor::PadMissingPackets(char* buf) { uint32_t fifohsize = generalData->fifoBufferHeaderSize; uint32_t corrected_dsize = dsize - ((pperFrame * dsize) - generalData->imageSize); - for (int pnum = 0; pnum < pperFrame; ++pnum) { + for (unsigned int pnum = 0; pnum < pperFrame; ++pnum) { // not missing packet if (pmask[pnum]) diff --git a/slsReceiverSoftware/src/HDF5File.cpp b/slsReceiverSoftware/src/HDF5File.cpp index 7bf5c2098..f929d9558 100644 --- a/slsReceiverSoftware/src/HDF5File.cpp +++ b/slsReceiverSoftware/src/HDF5File.cpp @@ -157,9 +157,9 @@ int HDF5File::CreateFile(uint64_t fnum) { if (dataspace == NULL) cprintf(RED,"Got nothing!\n"); - if(!silentMode) + if(!silentMode) { FILE_LOG(logINFO) << *udpPortNumber << ": HDF5 File created: " << currentFileName; - + } return OK; } @@ -225,8 +225,9 @@ int HDF5File::CreateMasterFile(bool en, uint32_t size, virtualfd = 0; masterFileName = HDF5FileStatic::CreateMasterFileName(filePath, fileNamePrefix, *fileIndex); - if(!silentMode) + if(!silentMode) { FILE_LOG(logINFO) << "Master File: " << masterFileName; + } pthread_mutex_lock(&Mutex); int ret = HDF5FileStatic::CreateMasterDataFile(masterfd, masterFileName, *overWriteEnable, diff --git a/slsReceiverSoftware/src/UDPStandardImplementation.cpp b/slsReceiverSoftware/src/UDPStandardImplementation.cpp index 4bb0a1983..8f6957e2d 100644 --- a/slsReceiverSoftware/src/UDPStandardImplementation.cpp +++ b/slsReceiverSoftware/src/UDPStandardImplementation.cpp @@ -658,7 +658,6 @@ int UDPStandardImplementation::restreamStop() { void UDPStandardImplementation::SetLocalNetworkParameters() { - char command[255]; // to increase Max length of input packet queue int max_back_log; diff --git a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp index ae3e3d74c..62426d9dd 100644 --- a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp +++ b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp @@ -2680,7 +2680,7 @@ int slsReceiverTCPIPInterface::set_udp_socket_buffer_size() { } //get retval=receiverBase->getUDPSocketBufferSize(); - if(index >= 0 && ((retval != index) || (receiverBase->getActualUDPSocketBufferSize() != (index*2)))) { + if(index >= 0 && ((retval != index) || ((int)receiverBase->getActualUDPSocketBufferSize() != (index*2)))) { ret = FAIL; strcpy(mess, "Could not set UDP Socket buffer size (No CAP_NET_ADMIN privileges?)\n"); FILE_LOG(logERROR) << mess; @@ -2810,7 +2810,8 @@ int slsReceiverTCPIPInterface::check_version_compatibility() { sprintf(mess,"This client is incompatible.\n" "Client's receiver API Version: (0x%llx). Receiver API Version: (0x%llx).\n" "Incompatible, update client!\n", - client_requiredVersion, rx_apiVersion); + (long long unsigned int)client_requiredVersion, + (long long unsigned int)rx_apiVersion); FILE_LOG(logERROR) << mess; } @@ -2820,7 +2821,8 @@ int slsReceiverTCPIPInterface::check_version_compatibility() { sprintf(mess,"This receiver is incompatible.\n" "Receiver Version: (0x%llx). Client's receiver API Version: (0x%llx).\n" "Incompatible, update receiver!\n", - rx_version, client_requiredVersion); + (long long unsigned int)rx_version, + (long long unsigned int)client_requiredVersion); FILE_LOG(logERROR) << mess; } else FILE_LOG(logINFO) << "Compatibility with Client: Successful";