Moving headers into include/sls (#212)

slsReceiverSoftware/CMakeLists.txt

@@ -61,7 +61,7 @@ endif (SLS_USE_HDF5)
 
 #What is included in slsReceiverLib?
 set(PUBLICHEADERS
-    include/Receiver.h
+    include/sls/Receiver.h
 )
 
 
@@ -116,7 +116,8 @@ install(TARGETS slsReceiverShared slsReceiver slsMultiReceiver
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+        PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sls
+)
 
 install(FILES ${ZMQ_STATIC_ARCHIVE}
 DESTINATION lib)

slsReceiverSoftware/include/sls/Receiver.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "sls_detector_defs.h"
+#include "sls/sls_detector_defs.h"
 #include <memory>
 
 class ClientInterface;

slsReceiverSoftware/src/ClientInterface.cpp

@@ -1,11 +1,11 @@
 #include "ClientInterface.h"
-#include "ServerSocket.h"
-#include "StaticVector.h"
-#include "ToString.h"
+#include "sls/ServerSocket.h"
+#include "sls/StaticVector.h"
+#include "sls/ToString.h"
 
-#include "sls_detector_exceptions.h"
-#include "string_utils.h"
-#include "versionAPI.h"
+#include "sls/sls_detector_exceptions.h"
+#include "sls/string_utils.h"
+#include "sls/versionAPI.h"
 
 #include <array>
 #include <chrono>

slsReceiverSoftware/src/ClientInterface.h

@@ -1,9 +1,9 @@
 #pragma once
 #include "Implementation.h"
-#include "ServerSocket.h"
+#include "sls/ServerSocket.h"
 #include "receiver_defs.h"
-#include "sls_detector_defs.h"
-#include "sls_detector_funcs.h"
+#include "sls/sls_detector_defs.h"
+#include "sls/sls_detector_funcs.h"
 class ServerInterface;
 
 #include <atomic>

slsReceiverSoftware/src/DataProcessor.cpp

@@ -14,7 +14,7 @@
 #include "HDF5File.h"
 #endif
 #include "DataStreamer.h"
-#include "sls_detector_exceptions.h"
+#include "sls/sls_detector_exceptions.h"
 
 #include <cerrno>
 #include <cstring>

slsReceiverSoftware/src/DataStreamer.cpp

@@ -6,8 +6,8 @@
 #include "DataStreamer.h"
 #include "Fifo.h"
 #include "GeneralData.h"
-#include "ZmqSocket.h"
-#include "sls_detector_exceptions.h"
+#include "sls/ZmqSocket.h"
+#include "sls/sls_detector_exceptions.h"
 
 #include <cerrno>
 #include <iostream>

slsReceiverSoftware/src/DataStreamer.h

@@ -8,7 +8,7 @@
  */
 
 #include "ThreadObject.h"
-#include "network_utils.h"
+#include "sls/network_utils.h"
 
 class GeneralData;
 class Fifo;

slsReceiverSoftware/src/Fifo.cpp

@@ -6,7 +6,7 @@
  ***********************************************/
 
 #include "Fifo.h"
-#include "sls_detector_exceptions.h"
+#include "sls/sls_detector_exceptions.h"
 
 #include <cstdlib>
 #include <cstring>

slsReceiverSoftware/src/Fifo.h

@@ -9,10 +9,10 @@
  *@short constructs the fifo structure
  */
 
-#include "logger.h"
-#include "sls_detector_defs.h"
+#include "sls/logger.h"
+#include "sls/sls_detector_defs.h"
 
-#include "CircularFifo.h"
+#include "sls/CircularFifo.h"
 
 class Fifo : private virtual slsDetectorDefs {
 

slsReceiverSoftware/src/File.h

@@ -9,9 +9,9 @@
  *data to it
  */
 
-#include "logger.h"
+#include "sls/logger.h"
 #include "receiver_defs.h"
-#include "sls_detector_defs.h"
+#include "sls/sls_detector_defs.h"
 
 #include <string>
 

slsReceiverSoftware/src/GeneralData.h

@@ -7,10 +7,10 @@
  *@short abstract for setting/getting properties of detector data
  */
 
-#include "ToString.h"
-#include "logger.h"
+#include "sls/ToString.h"
+#include "sls/logger.h"
 #include "receiver_defs.h"
-#include "sls_detector_defs.h"
+#include "sls/sls_detector_defs.h"
 #include <cmath> //ceil
 #include <vector>
 

slsReceiverSoftware/src/Implementation.cpp

@@ -5,9 +5,9 @@
 #include "GeneralData.h"
 #include "Listener.h"
 #include "MasterAttributes.h"
-#include "ToString.h"
-#include "ZmqSocket.h" //just for the zmq port define
-#include "file_utils.h"
+#include "sls/ToString.h"
+#include "sls/ZmqSocket.h" //just for the zmq port define
+#include "sls/file_utils.h"
 
 #include <cerrno> //eperm
 #include <chrono>

slsReceiverSoftware/src/Implementation.h

@@ -1,7 +1,7 @@
 #pragma once
-#include "container_utils.h"
-#include "logger.h"
-#include "network_utils.h"
+#include "sls/container_utils.h"
+#include "sls/logger.h"
+#include "sls/network_utils.h"
 #include "receiver_defs.h"
 class GeneralData;
 class Listener;

slsReceiverSoftware/src/Listener.cpp

@@ -8,10 +8,10 @@
 #include "Listener.h"
 #include "Fifo.h"
 #include "GeneralData.h"
-#include "UdpRxSocket.h"
-#include "container_utils.h" // For sls::make_unique<>
-#include "network_utils.h"
-#include "sls_detector_exceptions.h"
+#include "sls/UdpRxSocket.h"
+#include "sls/container_utils.h" // For sls::make_unique<>
+#include "sls/network_utils.h"
+#include "sls/sls_detector_exceptions.h"
 
 #include <cerrno>
 #include <cstring>

slsReceiverSoftware/src/Listener.h

@@ -10,7 +10,7 @@
  */
 
 #include "ThreadObject.h"
-#include "UdpRxSocket.h"
+#include "sls/UdpRxSocket.h"
 #include <atomic>
 #include <memory>
 

slsReceiverSoftware/src/MasterAttributes.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "ToString.h"
-#include "logger.h"
-#include "sls_detector_defs.h"
+#include "sls/ToString.h"
+#include "sls/logger.h"
+#include "sls/sls_detector_defs.h"
 
 #ifdef HDF5C
 #include "H5Cpp.h"

slsReceiverSoftware/src/MultiReceiverApp.cpp

@@ -1,9 +1,9 @@
 /* Creates the slsMultiReceiver for running multiple receivers form a single
  * binary */
-#include "Receiver.h"
-#include "container_utils.h"
-#include "logger.h"
-#include "sls_detector_defs.h"
+#include "sls/Receiver.h"
+#include "sls/container_utils.h"
+#include "sls/logger.h"
+#include "sls/sls_detector_defs.h"
 
 #include <csignal> //SIGINT
 #include <cstring>

slsReceiverSoftware/src/Receiver.cpp

@@ -1,9 +1,9 @@
-#include "Receiver.h"
+#include "sls/Receiver.h"
 #include "ClientInterface.h"
-#include "container_utils.h"
-#include "logger.h"
-#include "sls_detector_exceptions.h"
-#include "versionAPI.h"
+#include "sls/container_utils.h"
+#include "sls/logger.h"
+#include "sls/sls_detector_exceptions.h"
+#include "sls/versionAPI.h"
 
 #include <cstdlib>
 #include <fstream>

slsReceiverSoftware/src/ReceiverApp.cpp

@@ -1,8 +1,8 @@
 /* slsReceiver */
-#include "Receiver.h"
-#include "container_utils.h"
-#include "logger.h"
-#include "sls_detector_defs.h"
+#include "sls/Receiver.h"
+#include "sls/container_utils.h"
+#include "sls/logger.h"
+#include "sls/sls_detector_defs.h"
 
 #include <csignal> //SIGINT
 #include <semaphore.h>

slsReceiverSoftware/src/ThreadObject.cpp

@@ -4,7 +4,7 @@
  ***********************************************/
 
 #include "ThreadObject.h"
-#include "container_utils.h"
+#include "sls/container_utils.h"
 #include <iostream>
 #include <sys/syscall.h>
 #include <unistd.h>

slsReceiverSoftware/src/ThreadObject.h

@@ -7,8 +7,8 @@
  *@short creates/destroys a thread
  */
 
-#include "logger.h"
-#include "sls_detector_defs.h"
+#include "sls/logger.h"
+#include "sls/sls_detector_defs.h"
 
 #include <atomic>
 #include <semaphore.h>

slsReceiverSoftware/src/receiver_defs.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "sls_detector_defs.h"
+#include "sls/sls_detector_defs.h"
 #include <cstdint>
 
 #define MAX_DIMENSIONS                  (2)

slsReceiverSoftware/tests/test-CircularFifo.cpp

@@ -1,4 +1,4 @@
-#include "CircularFifo.h"
+#include "sls/CircularFifo.h"
 #include "catch.hpp"
 #include <vector>