From f7a69383664799477fdbf7e50e3473c1d2a2ca62 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Mon, 8 Oct 2018 10:45:56 +0200 Subject: [PATCH] client moved everythign from common files to slsSupportLin/include --- Makefile | 4 +- README.md | 91 ------------- manual/manual-api/CMakeLists.txt | 2 +- manual/manual-api/Makefile | 4 +- slsDetectorGui/CMakeLists.txt | 2 +- slsDetectorGui/Makefile | 2 +- slsDetectorGui/client/Makefile | 4 +- slsDetectorGui/slsDetectorGui.pro | 2 +- slsDetectorSoftware/CMakeLists.txt | 18 +-- slsDetectorSoftware/Makefile | 8 +- slsDetectorSoftware/README | 19 --- slsDetectorSoftware/doxy.config | 24 ++-- slsDetectorSoftware/slsADCReader/Makefile | 21 --- slsDetectorSoftware/slsADCReader/slsADCReader | Bin 20662 -> 0 bytes .../slsADCReader/slsADCReader.cpp | 120 ------------------ .../slsDetectorClient/CMakeLists.txt | 2 +- .../slsDetectorClient/Makefile | 2 +- .../slsDetectorClient/Makefile.x04sa | 2 +- slsReceiverSoftware/CMakeLists.txt | 22 ++-- slsReceiverSoftware/Makefile | 4 +- .../include}/MySocketTCP.h | 0 .../include}/ZmqSocket.h | 0 {commonFiles => slsSupportLib/include}/ansi.h | 0 .../include}/communication_funcs.c | 0 .../include}/communication_funcs.h | 0 .../include}/error_defs.h | 0 .../include}/genericSocket.h | 0 .../include}/libzmq.a | Bin .../include}/logger.h | 0 .../include}/rapidjson/allocators.h | 0 .../include}/rapidjson/document.h | 0 .../include}/rapidjson/encodedstream.h | 0 .../include}/rapidjson/encodings.h | 0 .../include}/rapidjson/error/en.h | 0 .../include}/rapidjson/error/error.h | 0 .../include}/rapidjson/filereadstream.h | 0 .../include}/rapidjson/filewritestream.h | 0 .../include}/rapidjson/fwd.h | 0 .../include}/rapidjson/internal/biginteger.h | 0 .../include}/rapidjson/internal/diyfp.h | 0 .../include}/rapidjson/internal/dtoa.h | 0 .../include}/rapidjson/internal/ieee754.h | 0 .../include}/rapidjson/internal/itoa.h | 0 .../include}/rapidjson/internal/meta.h | 0 .../include}/rapidjson/internal/pow10.h | 0 .../include}/rapidjson/internal/regex.h | 0 .../include}/rapidjson/internal/stack.h | 0 .../include}/rapidjson/internal/strfunc.h | 0 .../include}/rapidjson/internal/strtod.h | 0 .../include}/rapidjson/internal/swap.h | 0 .../include}/rapidjson/istreamwrapper.h | 0 .../include}/rapidjson/memorybuffer.h | 0 .../include}/rapidjson/memorystream.h | 0 .../include}/rapidjson/msinttypes/inttypes.h | 0 .../include}/rapidjson/msinttypes/stdint.h | 0 .../include}/rapidjson/ostreamwrapper.h | 0 .../include}/rapidjson/pointer.h | 0 .../include}/rapidjson/prettywriter.h | 0 .../include}/rapidjson/rapidjson.h | 0 .../include}/rapidjson/reader.h | 0 .../include}/rapidjson/schema.h | 0 .../include}/rapidjson/stream.h | 0 .../include}/rapidjson/stringbuffer.h | 0 .../include}/rapidjson/writer.h | 0 .../include}/sls_detector_defs.h | 0 .../include}/sls_detector_funcs.h | 0 .../include}/sls_receiver_defs.h | 0 .../include}/sls_receiver_exceptions.h | 0 .../include}/sls_receiver_funcs.h | 0 .../include}/utilities.cpp | 0 .../include}/utilities.h | 0 .../include}/versionAPI.h | 0 {commonFiles => slsSupportLib/include}/zmq.h | 0 73 files changed, 51 insertions(+), 302 deletions(-) delete mode 100644 README.md delete mode 100644 slsDetectorSoftware/README delete mode 100644 slsDetectorSoftware/slsADCReader/Makefile delete mode 100755 slsDetectorSoftware/slsADCReader/slsADCReader delete mode 100644 slsDetectorSoftware/slsADCReader/slsADCReader.cpp rename {commonFiles => slsSupportLib/include}/MySocketTCP.h (100%) rename {commonFiles => slsSupportLib/include}/ZmqSocket.h (100%) rename {commonFiles => slsSupportLib/include}/ansi.h (100%) rename {commonFiles => slsSupportLib/include}/communication_funcs.c (100%) rename {commonFiles => slsSupportLib/include}/communication_funcs.h (100%) rename {commonFiles => slsSupportLib/include}/error_defs.h (100%) rename {commonFiles => slsSupportLib/include}/genericSocket.h (100%) rename {commonFiles => slsSupportLib/include}/libzmq.a (100%) rename {commonFiles => slsSupportLib/include}/logger.h (100%) rename {commonFiles => slsSupportLib/include}/rapidjson/allocators.h (100%) rename {commonFiles => slsSupportLib/include}/rapidjson/document.h (100%) rename {commonFiles => slsSupportLib/include}/rapidjson/encodedstream.h (100%) rename {commonFiles => slsSupportLib/include}/rapidjson/encodings.h (100%) rename {commonFiles => slsSupportLib/include}/rapidjson/error/en.h (100%) rename {commonFiles => slsSupportLib/include}/rapidjson/error/error.h (100%) rename {commonFiles => slsSupportLib/include}/rapidjson/filereadstream.h (100%) rename {commonFiles => slsSupportLib/include}/rapidjson/filewritestream.h (100%) rename {commonFiles => slsSupportLib/include}/rapidjson/fwd.h (100%) rename {commonFiles => slsSupportLib/include}/rapidjson/internal/biginteger.h (100%) rename {commonFiles => slsSupportLib/include}/rapidjson/internal/diyfp.h (100%) rename {commonFiles => slsSupportLib/include}/rapidjson/internal/dtoa.h (100%) rename {commonFiles => slsSupportLib/include}/rapidjson/internal/ieee754.h (100%) rename {commonFiles => slsSupportLib/include}/rapidjson/internal/itoa.h (100%) rename {commonFiles => slsSupportLib/include}/rapidjson/internal/meta.h (100%) rename {commonFiles => slsSupportLib/include}/rapidjson/internal/pow10.h (100%) rename {commonFiles => slsSupportLib/include}/rapidjson/internal/regex.h (100%) rename {commonFiles => slsSupportLib/include}/rapidjson/internal/stack.h (100%) rename {commonFiles => slsSupportLib/include}/rapidjson/internal/strfunc.h (100%) rename {commonFiles => slsSupportLib/include}/rapidjson/internal/strtod.h (100%) rename {commonFiles => slsSupportLib/include}/rapidjson/internal/swap.h (100%) rename {commonFiles => slsSupportLib/include}/rapidjson/istreamwrapper.h (100%) rename {commonFiles => slsSupportLib/include}/rapidjson/memorybuffer.h (100%) rename {commonFiles => slsSupportLib/include}/rapidjson/memorystream.h (100%) rename {commonFiles => slsSupportLib/include}/rapidjson/msinttypes/inttypes.h (100%) rename {commonFiles => slsSupportLib/include}/rapidjson/msinttypes/stdint.h (100%) rename {commonFiles => slsSupportLib/include}/rapidjson/ostreamwrapper.h (100%) rename {commonFiles => slsSupportLib/include}/rapidjson/pointer.h (100%) rename {commonFiles => slsSupportLib/include}/rapidjson/prettywriter.h (100%) rename {commonFiles => slsSupportLib/include}/rapidjson/rapidjson.h (100%) rename {commonFiles => slsSupportLib/include}/rapidjson/reader.h (100%) rename {commonFiles => slsSupportLib/include}/rapidjson/schema.h (100%) rename {commonFiles => slsSupportLib/include}/rapidjson/stream.h (100%) rename {commonFiles => slsSupportLib/include}/rapidjson/stringbuffer.h (100%) rename {commonFiles => slsSupportLib/include}/rapidjson/writer.h (100%) rename {commonFiles => slsSupportLib/include}/sls_detector_defs.h (100%) rename {commonFiles => slsSupportLib/include}/sls_detector_funcs.h (100%) rename {commonFiles => slsSupportLib/include}/sls_receiver_defs.h (100%) rename {commonFiles => slsSupportLib/include}/sls_receiver_exceptions.h (100%) rename {commonFiles => slsSupportLib/include}/sls_receiver_funcs.h (100%) rename {commonFiles => slsSupportLib/include}/utilities.cpp (100%) rename {commonFiles => slsSupportLib/include}/utilities.h (100%) rename {commonFiles => slsSupportLib/include}/versionAPI.h (100%) rename {commonFiles => slsSupportLib/include}/zmq.h (100%) diff --git a/Makefile b/Makefile index 773fa5282..fefe215ee 100755 --- a/Makefile +++ b/Makefile @@ -24,9 +24,9 @@ MANAPIDIR = $(MANDIR)/manual-api TABSPACE := "\t" -INCLUDES=-I. -I$(WD)/commonFiles -I$(LIBRARYDIR)/slsDetector -I$(LIBRARYDIR)/usersFunctions -I$(LIBRARYDIR)/multiSlsDetector -I$(LIBRARYDIR)/slsReceiverInterface -I$(LIBRARYRXRDIR)/include -I$(LIBRARYDIR)/threadFiles -I$(LIBRARYDIR)/sharedMemory -I$(ASM) +INCLUDES=-I. -I$(WD)/slsSupportLib/include -I$(LIBRARYDIR)/slsDetector -I$(LIBRARYDIR)/usersFunctions -I$(LIBRARYDIR)/multiSlsDetector -I$(LIBRARYDIR)/slsReceiverInterface -I$(LIBRARYRXRDIR)/include -I$(LIBRARYDIR)/threadFiles -I$(LIBRARYDIR)/sharedMemory -I$(ASM) -INCLUDESRXR += -I. -I$(LIBRARYRXRDIR)/include -I$(WD)/commonFiles -I$(CALIBDIR) -I$(ASM) +INCLUDESRXR += -I. -I$(LIBRARYRXRDIR)/include -I$(WD)/slsSupportLib/include -I$(CALIBDIR) -I$(ASM) #LIBFLAGRXR += $(info ) diff --git a/README.md b/README.md deleted file mode 100644 index 51b764d82..000000000 --- a/README.md +++ /dev/null @@ -1,91 +0,0 @@ -### Documentation -Detailed documentation can be found on the [official site.](https://www.psi.ch/detectors/users-support) - -### Binaries -Documentation to obtain the binaries via the conda package is available for [lib](https://github.com/slsdetectorgroup/sls_detector_lib) and [gui](https://github.com/slsdetectorgroup/sls_detector_gui) - -### Source code -One can also obtain the source code from this repository and compile while realizing the setup dependencies as required. -``` -git clone https://github.com/slsdetectorgroup/slsDetectorPackage.git - -``` -#### Setup dependencies -* Gui Client
-Requirements: Qt 4.8 and Qwt 6.0 -``` - export QTDIR=/usr/local/Trolltech/ - export QWTDIR=/usr/local/qwt-6.0.1/ -``` -If either of them does not exist, the GUI client will not be built. - -* Advanced user Calibration wizards
-Requirements: ROOT -``` - export ROOTSYS=/usr/local/root-5.34 -``` - -#### Compilation - -Compiling can be done in two ways. - -**1. Compile using script cmk.sh**
- -After compiling, the libraries and executables will be found in `slsDetectorPackage/build/bin` directory
- -Usage: [-c] [-b] [-h] [-d HDF5 directory] [-j]
- * -[no option]: only make
- * -c: Clean
- * -b: Builds/Rebuilds CMake files normal mode
- * -h: Builds/Rebuilds Cmake files with HDF5 package
- * -d: HDF5 Custom Directory
- * -t: Build/Rebuilds only text client
- * -r: Build/Rebuilds only receiver
- * -g: Build/Rebuilds only gui
- * -j: Number of threads to compile through
- * -e: Debug mode - -Basic Option: -./cmk.sh -b - -For only make: -./cmk.sh - -For make clean;make: -./cmk.sh -c - -For using hdf5 without custom dir /blabla: -./cmk.sh -h -d /blabla - -For rebuilding cmake without hdf5 -./cmk.sh -b - -For using multiple cores to compile faster: -./cmk.sh -j9
- - -For rebuilding only certain sections
-./cmk.sh -tg #only text client and gui
-./cmk.sh -r #only receiver
- - -**2. Compile without script**
-Use cmake to create out-of-source builds, by creating a build folder parallel to source directory. -``` - $ cd .. - $ mkdir slsDetectorPackage-build - $ cd slsDetectorPackage-build - $ cmake ../slsDetectorPackage -DCMAKE_BUILD_TYPE=Debug -DUSE_HDF5=OFF - $ make -``` - -Use the following as an example to compile statically and using specific hdf5 folder -``` - $ HDF5_ROOT=/opt/hdf5v1.10.0 cmake ../slsDetectorPackage -DCMAKE_BUILD_TYPE=Debug -DUSE_HDF5=ON - ``` -After compiling, the libraries and executables will be found at `bin` directory -``` - $ ls bin/ - gui_client libSlsDetector.a libSlsDetector.so libSlsReceiver.a libSlsReceiver.so - sls_detector_acquire sls_detector_get slsDetectorGui sls_detector_help sls_detector_put slsReceiver slsMultiReceiver -``` diff --git a/manual/manual-api/CMakeLists.txt b/manual/manual-api/CMakeLists.txt index 00de96101..0fadc4bab 100644 --- a/manual/manual-api/CMakeLists.txt +++ b/manual/manual-api/CMakeLists.txt @@ -3,7 +3,7 @@ set(SOURCES ) include_directories( - ../../commonFiles/include + ../../slsSupportLib/include ../../slsDetectorSoftware/slsDetectorAnalysis ../../build/bin ../../slsdetectorSoftware/slsDetector diff --git a/manual/manual-api/Makefile b/manual/manual-api/Makefile index 55122f7a5..abd52fa5d 100644 --- a/manual/manual-api/Makefile +++ b/manual/manual-api/Makefile @@ -1,9 +1,9 @@ PKGDIR = ../.. LIBDIR = $(PKGDIR)/build/bin -INCLUDES = -I . -I$(PKGDIR)/commonFiles -I$(PKGDIR)/slsDetectorSoftware/slsDetectorAnalysis -I$(LIBDIR) -I$(PKGDIR)/slsDetectorSoftware/slsDetector +INCLUDES = -I . -I$(PKGDIR)/slsSupportLib/include -I$(PKGDIR)/slsDetectorSoftware/slsDetectorAnalysis -I$(LIBDIR) -I$(PKGDIR)/slsDetectorSoftware/slsDetector SRC_DET = mainClient.cpp SRC_REC = mainReceiver.cpp -ZMQLIBDIR = $(PKGDIR)/commonFiles +ZMQLIBDIR = $(PKGDIR)/slsSupportLib/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 diff --git a/slsDetectorGui/CMakeLists.txt b/slsDetectorGui/CMakeLists.txt index a4b5abf5d..ef6e59880 100644 --- a/slsDetectorGui/CMakeLists.txt +++ b/slsDetectorGui/CMakeLists.txt @@ -75,7 +75,7 @@ qt4_add_resources(RESOURCES_SRCS ${RESOURCES}) include_directories( include slsDetectorPlotting/include - ../commonFiles + ../slsSupportLib/include ../slsDetectorSoftware/slsReceiverInterface ../slsDetectorSoftware/slsDetector ../slsDetectorSoftware/slsDetectorAnalysis diff --git a/slsDetectorGui/Makefile b/slsDetectorGui/Makefile index 71f330347..387e2d5d2 100644 --- a/slsDetectorGui/Makefile +++ b/slsDetectorGui/Makefile @@ -16,7 +16,7 @@ DOCDIR ?= docs LIBRARYDIR ?= ../slsDetectorSoftware LIBRARYRXRDIR ?= ../slsReceiverSoftware -INCLUDES ?= ../commonFiles -I$(LIBRARYRXRDIR)/MySocketTCP -I$(LIBRARYDIR)/slsReceiverInterface -I$(LIBRARYDIR)/slsDetector -I$(LIBRARYDIR)/slsDetectorAnalysis -I$(LIBRARYDIR)/multiSlsDetector -I$(LIBRARYDIR)/usersFunctions -I$(LIBRARYRXRDIR)/includes +INCLUDES ?= ../slsSupportLib/include -I$(LIBRARYRXRDIR)/MySocketTCP -I$(LIBRARYDIR)/slsReceiverInterface -I$(LIBRARYDIR)/slsDetector -I$(LIBRARYDIR)/slsDetectorAnalysis -I$(LIBRARYDIR)/multiSlsDetector -I$(LIBRARYDIR)/usersFunctions -I$(LIBRARYRXRDIR)/includes LDFLAGDET ?= -L$(LIBDIR) -Wl,-rpath=$(LIBDIR) -lSlsDetector diff --git a/slsDetectorGui/client/Makefile b/slsDetectorGui/client/Makefile index 2b74aba13..2ec55c328 100644 --- a/slsDetectorGui/client/Makefile +++ b/slsDetectorGui/client/Makefile @@ -5,9 +5,9 @@ LDLIBS += -lm -lstdc++ -pthread LDIR = ../../slsDetectorSoftware RDIR = ../../slsReceiverSoftware DDIR = ../../bin -INCLUDES = -I ../../commonFiles -I $(LDIR)/slsDetector -I ../include -I $(RDIR)/include +INCLUDES = -I ../../slsSupportLib/include -I $(LDIR)/slsDetector -I ../include -I $(RDIR)/include SRC_CLNT = qClient.cpp -DEPSINCLUDES= qClient.h $(RDIR)/include/MySocketTCP.h $(LDIR)/slsDetector/slsDetectorBase.h ../../commonFiles/sls_detector_defs.h +DEPSINCLUDES= qClient.h $(RDIR)/include/MySocketTCP.h $(LDIR)/slsDetector/slsDetectorBase.h ../../slsSupportLib/include/sls_detector_defs.h all: client diff --git a/slsDetectorGui/slsDetectorGui.pro b/slsDetectorGui/slsDetectorGui.pro index a814921d7..e286dde6b 100644 --- a/slsDetectorGui/slsDetectorGui.pro +++ b/slsDetectorGui/slsDetectorGui.pro @@ -145,7 +145,7 @@ HEADERS = \ include/qTabDeveloper.h\ include/qTabMessages.h\ include/gitInfoGui.h\ - ../commonFiles/sls_detector_defs.h\ + ../slsSupportLib/include/sls_detector_defs.h\ ../slsReceiverSoftware/include/sls_receiver_defs.h\ include/qServer.h diff --git a/slsDetectorSoftware/CMakeLists.txt b/slsDetectorSoftware/CMakeLists.txt index af71006d5..f145cfdb1 100644 --- a/slsDetectorSoftware/CMakeLists.txt +++ b/slsDetectorSoftware/CMakeLists.txt @@ -5,14 +5,14 @@ set(SOURCES slsDetector/slsDetectorCommand.cpp slsDetector/slsDetector.cpp slsReceiverInterface/receiverInterface.cpp - ../commonFiles/utilities.cpp + ../slsSupportLib/include/utilities.cpp ) set(HEADERS ) include_directories( -../commonFiles +../slsSupportLib/include multiSlsDetector sharedMemory slsDetector @@ -36,7 +36,7 @@ add_library(slsDetectorShared SHARED add_library(zmq STATIC IMPORTED GLOBAL) -set(ZMQ_STATIC_ARCHIVE ${CMAKE_CURRENT_SOURCE_DIR}/../commonFiles/libzmq.a) +set(ZMQ_STATIC_ARCHIVE ${CMAKE_CURRENT_SOURCE_DIR}/../slsSupportLib/include/libzmq.a) set_target_properties(zmq PROPERTIES IMPORTED_LOCATION ${ZMQ_STATIC_ARCHIVE} ) @@ -46,12 +46,12 @@ target_link_libraries(slsDetectorShared ) set(PUBLICHEADERS - ../commonFiles/sls_detector_defs.h - ../commonFiles/sls_detector_funcs.h - ../commonFiles/error_defs.h - ../commonFiles/versionAPI.h - ../commonFiles/sls_receiver_exceptions.h - ../commonFiles/utilties.h + ../slsSupportLib/include/sls_detector_defs.h + ../slsSupportLib/include/sls_detector_funcs.h + ../slsSupportLib/include/error_defs.h + ../slsSupportLib/include/versionAPI.h + ../slsSupportLib/include/sls_receiver_exceptions.h + ../slsSupportLib/include/utilties.h ../slsSupportLib/include/container_utils.h sharedMemory/SharedMemory.h slsDetector/slsDetector.h diff --git a/slsDetectorSoftware/Makefile b/slsDetectorSoftware/Makefile index 3fa02c3a8..3e21793aa 100644 --- a/slsDetectorSoftware/Makefile +++ b/slsDetectorSoftware/Makefile @@ -9,15 +9,15 @@ CFLAGS= -g -DC_ONLY -fPIC DFLAGS= -g -DDACS_INT -INCLUDES?= -I../commonFiles -IslsDetector -ImultiSlsDetector -IslsReceiverInterface -IsharedMemory -I ../slsSupportLib/include-I$(ASM) +INCLUDES?= -I../slsSupportLib/include -IslsDetector -ImultiSlsDetector -IslsReceiverInterface -IsharedMemory I$(ASM) #EPICSFLAGS=-D EPICS -I/usr/local/epics/base/include/ -I /usr/local/epics/base/include/os/Linux/ -L /usr/local/epics/base/lib/$(EPICS_HOST_ARCH) -Wl,-R/usr/local/epics/base/lib/$(EPICS_HOST_ARCH) -lca -lCom -LIBZMQDIR = ../commonFiles +LIBZMQDIR = ../slsSupportLib/include LIBZMQ = -L$(LIBZMQDIR) -Wl,-rpath=$(LIBZMQDIR) -lzmq -SRC_CLNT= slsDetector/slsDetectorCommand.cpp slsDetector/slsDetector.cpp multiSlsDetector/multiSlsDetector.cpp slsReceiverInterface/receiverInterface.cpp slsDetector/slsDetectorUsers.cpp sharedMemory/SharedMemory.cpp ../commonFiles/utilities.cpp -DEPSINCLUDES = ../commonFiles/sls_receiver_defs.h ../commonFiles/sls_receiver_funcs.h ../commonFiles/ansi.h ../commonFiles/sls_detector_defs.h ../commonFiles/sls_detector_funcs.h ../commonFiles/error_defs.h slsDetector/slsDetectorBase.h slsDetector/detectorData.h sharedMemory/SharedMemory.h ../commonFiles/sls_receiver_exceptions.h ../commonFiles/versionAPI.h ../commonFiles/utilities.h ../slsSupportLib/include/container_utils.h +SRC_CLNT= slsDetector/slsDetectorCommand.cpp slsDetector/slsDetector.cpp multiSlsDetector/multiSlsDetector.cpp slsReceiverInterface/receiverInterface.cpp slsDetector/slsDetectorUsers.cpp sharedMemory/SharedMemory.cpp ../slsSupportLib/include/utilities.cpp +DEPSINCLUDES = ../slsSupportLib/include/sls_receiver_defs.h ../slsSupportLib/include/sls_receiver_funcs.h ../slsSupportLib/include/ansi.h ../slsSupportLib/include/sls_detector_defs.h ../slsSupportLib/include/sls_detector_funcs.h ../slsSupportLib/include/error_defs.h slsDetector/slsDetectorBase.h slsDetector/detectorData.h sharedMemory/SharedMemory.h ../slsSupportLib/include/sls_receiver_exceptions.h ../slsSupportLib/include/versionAPI.h ../slsSupportLib/include/utilities.h ../slsSupportLib/include/container_utils.h diff --git a/slsDetectorSoftware/README b/slsDetectorSoftware/README deleted file mode 100644 index b1cfea7a7..000000000 --- a/slsDetectorSoftware/README +++ /dev/null @@ -1,19 +0,0 @@ -This subversion repository contains - -Common directories -Please inform Anna or Dhanya if you make modifications to these directories -- MySocketTCP : socket class -- commonFiles : header file common to server and client -- slsDetector : base class with all main detector functionalities (client side) - - -Mythen specific directories -Please inform Anna if you make modifications to these directories -- mythenDetector : mythen specific funcs (mainly files I/O and angular conversion) -- mythenDetectorServer : mythen server (for etrax compiler) -- firmware lib might be added in the future - -Other Detector specific directories -Please inform Dhanya if you make modifications to these directories - -make doc diff --git a/slsDetectorSoftware/doxy.config b/slsDetectorSoftware/doxy.config index b7546c379..cfe37d367 100644 --- a/slsDetectorSoftware/doxy.config +++ b/slsDetectorSoftware/doxy.config @@ -80,18 +80,18 @@ LATEX_HIDE_INDICES = YES PREDEFINED = __cplusplus -INPUT = ../commonfiles/communication_funcs.h \ - ../commonfiles/error_defs.h \ - ../commonfiles/sls_detector_defs.h \ - ../commonfiles/sls_detector_funcs.h \ - ../commonfiles/ansi.h \ - ../commonfiles/include/genericSocket.h \ - ../commonfiles/include/logger.h \ - ../commonfiles/include/MySocketTCP.h \ - ../commonfiles/include/sls_receiver_defs.h \ - ../commonfiles/include/sls_receiver_funcs.h \ - ../commonfiles/include/utilities.h \ - ../commonfiles/include/ZmqSocket.h \ +INPUT = ../slsSupportLib/include/communication_funcs.h \ + ../slsSupportLib/include/error_defs.h \ + ../slsSupportLib/include/sls_detector_defs.h \ + ../slsSupportLib/include/sls_detector_funcs.h \ + ../slsSupportLib/include/ansi.h \ + ../slsSupportLib/include/genericSocket.h \ + ../slsSupportLib/include/logger.h \ + ../slsSupportLib/include/MySocketTCP.h \ + ../slsSupportLib/include/sls_receiver_defs.h \ + ../slsSupportLib/include/sls_receiver_funcs.h \ + ../slsSupportLib/include/utilities.h \ + ../slsSupportLib/include/ZmqSocket.h \ multiSlsDetector/multiSlsDetectorClient.h \ multiSlsDetector/multiSlsDetectorCommand.h \ multiSlsDetector/multiSlsDetector.h \ diff --git a/slsDetectorSoftware/slsADCReader/Makefile b/slsDetectorSoftware/slsADCReader/Makefile deleted file mode 100644 index dbb0664d0..000000000 --- a/slsDetectorSoftware/slsADCReader/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -CC = g++ -#CC = bfin-uclinux- -SRC = slsADCReader.cpp -INCLUDES = -I ../../slsReceiverSoftware/include -I ../../commonFiles -CFLAGS = -Wall -lm -lstdc++ - - -all: clean slsADCReader - - -slsADCReader: $(SRC) - echo "creating adc reader" - $(CC) -o $@ $^ $(CFLAGS) $(INCLUDES) - - -clean: - echo "cleaning" - rm -rf *.o - - - diff --git a/slsDetectorSoftware/slsADCReader/slsADCReader b/slsDetectorSoftware/slsADCReader/slsADCReader deleted file mode 100755 index 3117fc8bf9f60a04f2b74f2796f1f22222b9573d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20662 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 diff --git a/slsDetectorSoftware/slsADCReader/slsADCReader.cpp b/slsDetectorSoftware/slsADCReader/slsADCReader.cpp deleted file mode 100644 index 8d9911dee..000000000 --- a/slsDetectorSoftware/slsADCReader/slsADCReader.cpp +++ /dev/null @@ -1,120 +0,0 @@ -#include "MySocketTCP.h" - -#include "sls_detector_defs.h" -#include "sls_receiver_defs.h" - -#include "sls_detector_funcs.h" - -#include -#include - -#define INVALID -999 - -enum detectorFunctions{ - F_GET_ADC=13 -}; - -void help() { - cerr << "Usage:\n" - "slsAdcReader [hostname] [adcval]" << endl; - exit(EXIT_FAILURE); -} - - -slsDetectorDefs::dacIndex getADCEnum(char* cval){ - int idac; - string cmd; - cmd.assign(cval); - - if (sscanf(cval,"adc:%d",&idac)==1) { - return (slsDetectorDefs::dacIndex)(idac+1000); - } else if (cmd=="temp_adc") - return slsDetectorDefs::TEMPERATURE_ADC; - else if (cmd=="temp_fpga") - return slsDetectorDefs::TEMPERATURE_FPGA; - else if (cmd=="temp_fpgaext") - return slsDetectorDefs::TEMPERATURE_FPGAEXT; - else if (cmd=="temp_10ge") - return slsDetectorDefs::TEMPERATURE_10GE; - else if (cmd=="temp_dcdc") - return slsDetectorDefs::TEMPERATURE_DCDC; - else if (cmd=="temp_sodl") - return slsDetectorDefs::TEMPERATURE_SODL; - else if (cmd=="temp_sodr") - return slsDetectorDefs::TEMPERATURE_SODR; - else if (cmd=="temp_fpgafl") - return slsDetectorDefs::TEMPERATURE_FPGA2; - else if (cmd=="temp_fpgafr") - return slsDetectorDefs::TEMPERATURE_FPGA3; - else if (cmd=="i_a") - return slsDetectorDefs::I_POWER_A; - else if (cmd=="i_b") - return slsDetectorDefs::I_POWER_B; - else if (cmd=="i_c") - return slsDetectorDefs::I_POWER_C; - else if (cmd=="i_d") - return slsDetectorDefs::I_POWER_D; - else if (cmd=="vm_a") - return slsDetectorDefs::V_POWER_A; - else if (cmd=="vm_b") - return slsDetectorDefs::V_POWER_B; - else if (cmd=="vm_c") - return slsDetectorDefs::V_POWER_C; - else if (cmd=="vm_d") - return slsDetectorDefs::V_POWER_D; - else if (cmd=="vm_io") - return slsDetectorDefs::V_POWER_IO; - else if (cmd=="i_io") - return slsDetectorDefs::I_POWER_IO; - else { - cerr << "cannot decode dac " << cmd << endl; - help(); - return slsDetectorDefs::I_POWER_IO; - } -}; - - - -int main(int argc, char* argv[]) -{ - if (argc < 3) - help(); - slsDetectorDefs::dacIndex idx=getADCEnum(argv[2]); - - - char mess[MAX_STR_LENGTH]=""; - detectorFunctions fnum=F_GET_ADC; - int retval=-1; - int ret=slsReceiverDefs::FAIL; - int arg[2]={idx,0}; - - MySocketTCP* mySocket = 0; - - try { - mySocket = new MySocketTCP(argv[1],1952); - } catch (...) { - cerr << "could not create socket with " << argv[1] << endl; - help(); - } - - if (mySocket->Connect()) { - mySocket->SendDataOnly(&fnum, sizeof(fnum)); - mySocket->SendDataOnly(arg,sizeof(arg)); - mySocket->ReceiveDataOnly(&ret, sizeof(ret)); - if (ret != slsReceiverDefs::FAIL) { - mySocket->ReceiveDataOnly(&retval, sizeof(retval)); - } else { - mySocket->ReceiveDataOnly(mess,sizeof(mess)); - printf("Detector returned Error: %s",mess); - } - mySocket->Disconnect(); - } else - cerr << "could not connect to " << argv[1] << endl; - - if (idx <= 100) { - printf("%.2f°C\n",(double)retval/1000.00); - }else - printf("%dmV\n",retval); - - return EXIT_SUCCESS; -} diff --git a/slsDetectorSoftware/slsDetectorClient/CMakeLists.txt b/slsDetectorSoftware/slsDetectorClient/CMakeLists.txt index 6e9de0de3..1355808d9 100644 --- a/slsDetectorSoftware/slsDetectorClient/CMakeLists.txt +++ b/slsDetectorSoftware/slsDetectorClient/CMakeLists.txt @@ -3,7 +3,7 @@ set(SOURCES ) include_directories( - ../../commonfiles + ../../slsSupportLib/include ../multiSlsDetector ../slsDetector ../slsReceiverInterface diff --git a/slsDetectorSoftware/slsDetectorClient/Makefile b/slsDetectorSoftware/slsDetectorClient/Makefile index b278fe3ad..333c55c96 100644 --- a/slsDetectorSoftware/slsDetectorClient/Makefile +++ b/slsDetectorSoftware/slsDetectorClient/Makefile @@ -4,7 +4,7 @@ CFLAGS= -DC_ONLY #FLAGS=-DVERBOSE #ASM=$(shell echo "/lib/modules/`uname -r`/build/include") -INCLUDES?= -I../../commonfiles -I../slsDetector -I../multiSlsDetector -I../slsReceiverInterface -I$(shell echo "/lib/modules/`uname -r`/build/include") +INCLUDES?= -I../../slsSupportLib/include -I../slsDetector -I../multiSlsDetector -I../slsReceiverInterface -I$(shell echo "/lib/modules/`uname -r`/build/include") DESTDIR ?= ../../bin BIN=$(DESTDIR) LIBS?= -L$(DESTDIR) -lSlsDetector diff --git a/slsDetectorSoftware/slsDetectorClient/Makefile.x04sa b/slsDetectorSoftware/slsDetectorClient/Makefile.x04sa index b5c95f9f6..bb800f7c1 100644 --- a/slsDetectorSoftware/slsDetectorClient/Makefile.x04sa +++ b/slsDetectorSoftware/slsDetectorClient/Makefile.x04sa @@ -1,6 +1,6 @@ CFLAGS= -DC_ONLY FLAGS=-DVERBOSE -INCLUDES= -I../commonFiles -I../slsDetectorSoftware/slsDetector -I ../slsDetectorSoftware/MySocketTCP -I../slsDetectorSoftware/usersFunctions -I../slsDetectorSoftware/multiSlsDetector -I../slsDetectorSoftware/slsDetectorAnalysis +INCLUDES= -I../slsSupportLib/include -I../slsDetectorSoftware/slsDetector -I ../slsDetectorSoftware/MySocketTCP -I../slsDetectorSoftware/usersFunctions -I../slsDetectorSoftware/multiSlsDetector -I../slsDetectorSoftware/slsDetectorAnalysis LIBS= -L../slsDetectorSoftware/ LDFLAG= -lSlsDetector -pthread diff --git a/slsReceiverSoftware/CMakeLists.txt b/slsReceiverSoftware/CMakeLists.txt index 07da638a5..23e82f4ee 100644 --- a/slsReceiverSoftware/CMakeLists.txt +++ b/slsReceiverSoftware/CMakeLists.txt @@ -13,7 +13,7 @@ set(SOURCES src/DataProcessor.cpp src/DataStreamer.cpp src/Fifo.cpp - ../commonFiles/utilities.cpp + ../slsSupportLib/include/utilities.cpp ) @@ -39,12 +39,12 @@ add_definitions( include_directories( include - ../commonFiles + ../slsSupportLib/include ) add_library(zmq STATIC IMPORTED GLOBAL) -set(ZMQ_STATIC_ARCHIVE ${CMAKE_CURRENT_SOURCE_DIR}/../commonFiles/libzmq.a) +set(ZMQ_STATIC_ARCHIVE ${CMAKE_CURRENT_SOURCE_DIR}/../slsSupportLib/include/libzmq.a) set_target_properties(zmq PROPERTIES IMPORTED_LOCATION ${ZMQ_STATIC_ARCHIVE} ) @@ -64,14 +64,14 @@ add_library(slsReceiverShared SHARED ) set(PUBLICHEADERS - ../commonFiles/sls_receiver_defs.h - ../commonFiles/ansi.h - ../commonFiles/sls_receiver_funcs.h - ../commonFiles/MySocketTCP.h - ../commonFiles/genericSocket.h - ../commonFiles/logger.h - ../commonFiles/sls_receiver_exceptions.h - ../commonFiles/utilities.h + ../slsSupportLib/include/sls_receiver_defs.h + ../slsSupportLib/include/ansi.h + ../slsSupportLib/include/sls_receiver_funcs.h + ../slsSupportLib/include/MySocketTCP.h + ../slsSupportLib/include/genericSocket.h + ../slsSupportLib/include/logger.h + ../slsSupportLib/include/sls_receiver_exceptions.h + ../slsSupportLib/include/utilities.h ) diff --git a/slsReceiverSoftware/Makefile b/slsReceiverSoftware/Makefile index 3f76c46c8..a0336e9c8 100644 --- a/slsReceiverSoftware/Makefile +++ b/slsReceiverSoftware/Makefile @@ -5,7 +5,7 @@ LIBDIR ?= ../bin DOCDIR ?= docs SRCDIR = src INCDIR = include -COMMONDIR = ../commonFiles +COMMONDIR = ../slsSupportLib/include TESTDIR = test BUILDDIR = build PROGS = $(DESTDIR)/slsReceiver @@ -21,7 +21,7 @@ INCLUDES?= $(INCLUDESRXR) -I $(INCDIR) -I $(COMMONDIR) ############################################################## # ZMQ specific: in this case, you need ZMQ libraries already included in this package ########################################################### -LIBZMQDIR = ../commonFiles +LIBZMQDIR = ../slsSupportLib/include LIBZMQ = -L$(LIBZMQDIR) -Wl,-rpath=$(LIBZMQDIR) -lzmq diff --git a/commonFiles/MySocketTCP.h b/slsSupportLib/include/MySocketTCP.h similarity index 100% rename from commonFiles/MySocketTCP.h rename to slsSupportLib/include/MySocketTCP.h diff --git a/commonFiles/ZmqSocket.h b/slsSupportLib/include/ZmqSocket.h similarity index 100% rename from commonFiles/ZmqSocket.h rename to slsSupportLib/include/ZmqSocket.h diff --git a/commonFiles/ansi.h b/slsSupportLib/include/ansi.h similarity index 100% rename from commonFiles/ansi.h rename to slsSupportLib/include/ansi.h diff --git a/commonFiles/communication_funcs.c b/slsSupportLib/include/communication_funcs.c similarity index 100% rename from commonFiles/communication_funcs.c rename to slsSupportLib/include/communication_funcs.c diff --git a/commonFiles/communication_funcs.h b/slsSupportLib/include/communication_funcs.h similarity index 100% rename from commonFiles/communication_funcs.h rename to slsSupportLib/include/communication_funcs.h diff --git a/commonFiles/error_defs.h b/slsSupportLib/include/error_defs.h similarity index 100% rename from commonFiles/error_defs.h rename to slsSupportLib/include/error_defs.h diff --git a/commonFiles/genericSocket.h b/slsSupportLib/include/genericSocket.h similarity index 100% rename from commonFiles/genericSocket.h rename to slsSupportLib/include/genericSocket.h diff --git a/commonFiles/libzmq.a b/slsSupportLib/include/libzmq.a similarity index 100% rename from commonFiles/libzmq.a rename to slsSupportLib/include/libzmq.a diff --git a/commonFiles/logger.h b/slsSupportLib/include/logger.h similarity index 100% rename from commonFiles/logger.h rename to slsSupportLib/include/logger.h diff --git a/commonFiles/rapidjson/allocators.h b/slsSupportLib/include/rapidjson/allocators.h similarity index 100% rename from commonFiles/rapidjson/allocators.h rename to slsSupportLib/include/rapidjson/allocators.h diff --git a/commonFiles/rapidjson/document.h b/slsSupportLib/include/rapidjson/document.h similarity index 100% rename from commonFiles/rapidjson/document.h rename to slsSupportLib/include/rapidjson/document.h diff --git a/commonFiles/rapidjson/encodedstream.h b/slsSupportLib/include/rapidjson/encodedstream.h similarity index 100% rename from commonFiles/rapidjson/encodedstream.h rename to slsSupportLib/include/rapidjson/encodedstream.h diff --git a/commonFiles/rapidjson/encodings.h b/slsSupportLib/include/rapidjson/encodings.h similarity index 100% rename from commonFiles/rapidjson/encodings.h rename to slsSupportLib/include/rapidjson/encodings.h diff --git a/commonFiles/rapidjson/error/en.h b/slsSupportLib/include/rapidjson/error/en.h similarity index 100% rename from commonFiles/rapidjson/error/en.h rename to slsSupportLib/include/rapidjson/error/en.h diff --git a/commonFiles/rapidjson/error/error.h b/slsSupportLib/include/rapidjson/error/error.h similarity index 100% rename from commonFiles/rapidjson/error/error.h rename to slsSupportLib/include/rapidjson/error/error.h diff --git a/commonFiles/rapidjson/filereadstream.h b/slsSupportLib/include/rapidjson/filereadstream.h similarity index 100% rename from commonFiles/rapidjson/filereadstream.h rename to slsSupportLib/include/rapidjson/filereadstream.h diff --git a/commonFiles/rapidjson/filewritestream.h b/slsSupportLib/include/rapidjson/filewritestream.h similarity index 100% rename from commonFiles/rapidjson/filewritestream.h rename to slsSupportLib/include/rapidjson/filewritestream.h diff --git a/commonFiles/rapidjson/fwd.h b/slsSupportLib/include/rapidjson/fwd.h similarity index 100% rename from commonFiles/rapidjson/fwd.h rename to slsSupportLib/include/rapidjson/fwd.h diff --git a/commonFiles/rapidjson/internal/biginteger.h b/slsSupportLib/include/rapidjson/internal/biginteger.h similarity index 100% rename from commonFiles/rapidjson/internal/biginteger.h rename to slsSupportLib/include/rapidjson/internal/biginteger.h diff --git a/commonFiles/rapidjson/internal/diyfp.h b/slsSupportLib/include/rapidjson/internal/diyfp.h similarity index 100% rename from commonFiles/rapidjson/internal/diyfp.h rename to slsSupportLib/include/rapidjson/internal/diyfp.h diff --git a/commonFiles/rapidjson/internal/dtoa.h b/slsSupportLib/include/rapidjson/internal/dtoa.h similarity index 100% rename from commonFiles/rapidjson/internal/dtoa.h rename to slsSupportLib/include/rapidjson/internal/dtoa.h diff --git a/commonFiles/rapidjson/internal/ieee754.h b/slsSupportLib/include/rapidjson/internal/ieee754.h similarity index 100% rename from commonFiles/rapidjson/internal/ieee754.h rename to slsSupportLib/include/rapidjson/internal/ieee754.h diff --git a/commonFiles/rapidjson/internal/itoa.h b/slsSupportLib/include/rapidjson/internal/itoa.h similarity index 100% rename from commonFiles/rapidjson/internal/itoa.h rename to slsSupportLib/include/rapidjson/internal/itoa.h diff --git a/commonFiles/rapidjson/internal/meta.h b/slsSupportLib/include/rapidjson/internal/meta.h similarity index 100% rename from commonFiles/rapidjson/internal/meta.h rename to slsSupportLib/include/rapidjson/internal/meta.h diff --git a/commonFiles/rapidjson/internal/pow10.h b/slsSupportLib/include/rapidjson/internal/pow10.h similarity index 100% rename from commonFiles/rapidjson/internal/pow10.h rename to slsSupportLib/include/rapidjson/internal/pow10.h diff --git a/commonFiles/rapidjson/internal/regex.h b/slsSupportLib/include/rapidjson/internal/regex.h similarity index 100% rename from commonFiles/rapidjson/internal/regex.h rename to slsSupportLib/include/rapidjson/internal/regex.h diff --git a/commonFiles/rapidjson/internal/stack.h b/slsSupportLib/include/rapidjson/internal/stack.h similarity index 100% rename from commonFiles/rapidjson/internal/stack.h rename to slsSupportLib/include/rapidjson/internal/stack.h diff --git a/commonFiles/rapidjson/internal/strfunc.h b/slsSupportLib/include/rapidjson/internal/strfunc.h similarity index 100% rename from commonFiles/rapidjson/internal/strfunc.h rename to slsSupportLib/include/rapidjson/internal/strfunc.h diff --git a/commonFiles/rapidjson/internal/strtod.h b/slsSupportLib/include/rapidjson/internal/strtod.h similarity index 100% rename from commonFiles/rapidjson/internal/strtod.h rename to slsSupportLib/include/rapidjson/internal/strtod.h diff --git a/commonFiles/rapidjson/internal/swap.h b/slsSupportLib/include/rapidjson/internal/swap.h similarity index 100% rename from commonFiles/rapidjson/internal/swap.h rename to slsSupportLib/include/rapidjson/internal/swap.h diff --git a/commonFiles/rapidjson/istreamwrapper.h b/slsSupportLib/include/rapidjson/istreamwrapper.h similarity index 100% rename from commonFiles/rapidjson/istreamwrapper.h rename to slsSupportLib/include/rapidjson/istreamwrapper.h diff --git a/commonFiles/rapidjson/memorybuffer.h b/slsSupportLib/include/rapidjson/memorybuffer.h similarity index 100% rename from commonFiles/rapidjson/memorybuffer.h rename to slsSupportLib/include/rapidjson/memorybuffer.h diff --git a/commonFiles/rapidjson/memorystream.h b/slsSupportLib/include/rapidjson/memorystream.h similarity index 100% rename from commonFiles/rapidjson/memorystream.h rename to slsSupportLib/include/rapidjson/memorystream.h diff --git a/commonFiles/rapidjson/msinttypes/inttypes.h b/slsSupportLib/include/rapidjson/msinttypes/inttypes.h similarity index 100% rename from commonFiles/rapidjson/msinttypes/inttypes.h rename to slsSupportLib/include/rapidjson/msinttypes/inttypes.h diff --git a/commonFiles/rapidjson/msinttypes/stdint.h b/slsSupportLib/include/rapidjson/msinttypes/stdint.h similarity index 100% rename from commonFiles/rapidjson/msinttypes/stdint.h rename to slsSupportLib/include/rapidjson/msinttypes/stdint.h diff --git a/commonFiles/rapidjson/ostreamwrapper.h b/slsSupportLib/include/rapidjson/ostreamwrapper.h similarity index 100% rename from commonFiles/rapidjson/ostreamwrapper.h rename to slsSupportLib/include/rapidjson/ostreamwrapper.h diff --git a/commonFiles/rapidjson/pointer.h b/slsSupportLib/include/rapidjson/pointer.h similarity index 100% rename from commonFiles/rapidjson/pointer.h rename to slsSupportLib/include/rapidjson/pointer.h diff --git a/commonFiles/rapidjson/prettywriter.h b/slsSupportLib/include/rapidjson/prettywriter.h similarity index 100% rename from commonFiles/rapidjson/prettywriter.h rename to slsSupportLib/include/rapidjson/prettywriter.h diff --git a/commonFiles/rapidjson/rapidjson.h b/slsSupportLib/include/rapidjson/rapidjson.h similarity index 100% rename from commonFiles/rapidjson/rapidjson.h rename to slsSupportLib/include/rapidjson/rapidjson.h diff --git a/commonFiles/rapidjson/reader.h b/slsSupportLib/include/rapidjson/reader.h similarity index 100% rename from commonFiles/rapidjson/reader.h rename to slsSupportLib/include/rapidjson/reader.h diff --git a/commonFiles/rapidjson/schema.h b/slsSupportLib/include/rapidjson/schema.h similarity index 100% rename from commonFiles/rapidjson/schema.h rename to slsSupportLib/include/rapidjson/schema.h diff --git a/commonFiles/rapidjson/stream.h b/slsSupportLib/include/rapidjson/stream.h similarity index 100% rename from commonFiles/rapidjson/stream.h rename to slsSupportLib/include/rapidjson/stream.h diff --git a/commonFiles/rapidjson/stringbuffer.h b/slsSupportLib/include/rapidjson/stringbuffer.h similarity index 100% rename from commonFiles/rapidjson/stringbuffer.h rename to slsSupportLib/include/rapidjson/stringbuffer.h diff --git a/commonFiles/rapidjson/writer.h b/slsSupportLib/include/rapidjson/writer.h similarity index 100% rename from commonFiles/rapidjson/writer.h rename to slsSupportLib/include/rapidjson/writer.h diff --git a/commonFiles/sls_detector_defs.h b/slsSupportLib/include/sls_detector_defs.h similarity index 100% rename from commonFiles/sls_detector_defs.h rename to slsSupportLib/include/sls_detector_defs.h diff --git a/commonFiles/sls_detector_funcs.h b/slsSupportLib/include/sls_detector_funcs.h similarity index 100% rename from commonFiles/sls_detector_funcs.h rename to slsSupportLib/include/sls_detector_funcs.h diff --git a/commonFiles/sls_receiver_defs.h b/slsSupportLib/include/sls_receiver_defs.h similarity index 100% rename from commonFiles/sls_receiver_defs.h rename to slsSupportLib/include/sls_receiver_defs.h diff --git a/commonFiles/sls_receiver_exceptions.h b/slsSupportLib/include/sls_receiver_exceptions.h similarity index 100% rename from commonFiles/sls_receiver_exceptions.h rename to slsSupportLib/include/sls_receiver_exceptions.h diff --git a/commonFiles/sls_receiver_funcs.h b/slsSupportLib/include/sls_receiver_funcs.h similarity index 100% rename from commonFiles/sls_receiver_funcs.h rename to slsSupportLib/include/sls_receiver_funcs.h diff --git a/commonFiles/utilities.cpp b/slsSupportLib/include/utilities.cpp similarity index 100% rename from commonFiles/utilities.cpp rename to slsSupportLib/include/utilities.cpp diff --git a/commonFiles/utilities.h b/slsSupportLib/include/utilities.h similarity index 100% rename from commonFiles/utilities.h rename to slsSupportLib/include/utilities.h diff --git a/commonFiles/versionAPI.h b/slsSupportLib/include/versionAPI.h similarity index 100% rename from commonFiles/versionAPI.h rename to slsSupportLib/include/versionAPI.h diff --git a/commonFiles/zmq.h b/slsSupportLib/include/zmq.h similarity index 100% rename from commonFiles/zmq.h rename to slsSupportLib/include/zmq.h