Moving headers into include/sls (#212)

slsDetectorSoftware/src/CmdLineApp.cpp

@@ -5,11 +5,12 @@ This file is used to generate the command line binaries
 we get the different files.
 
 */
+#include "sls/Detector.h"
+
 #include "CmdParser.h"
 #include "CmdProxy.h"
-#include "Detector.h"
-#include "sls_detector_defs.h"
-#include "versionAPI.h"
+#include "sls/sls_detector_defs.h"
+#include "sls/versionAPI.h"
 #include <cstring> //strcmp
 #include <iostream>
 int main(int argc, char *argv[]) {

slsDetectorSoftware/src/CmdParser.cpp

@@ -1,6 +1,6 @@
 
 #include "CmdParser.h"
-#include "sls_detector_defs.h"
+#include "sls/sls_detector_defs.h"
 #include <cstdio>
 #include <cstring>
 #include <iostream>

slsDetectorSoftware/src/CmdProxy.cpp

@@ -1,11 +1,11 @@
 #include "CmdProxy.h"
 #include "HelpDacs.h"
-#include "TimeHelper.h"
-#include "ToString.h"
-#include "bit_utils.h"
-#include "container_utils.h"
-#include "logger.h"
-#include "sls_detector_defs.h"
+#include "sls/TimeHelper.h"
+#include "sls/ToString.h"
+#include "sls/bit_utils.h"
+#include "sls/container_utils.h"
+#include "sls/logger.h"
+#include "sls/sls_detector_defs.h"
 
 #include <iomanip>
 #include <iostream>

slsDetectorSoftware/src/CmdProxy.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "Detector.h"
-#include "Result.h"
-#include "network_utils.h"
-#include "sls_detector_exceptions.h"
+#include "sls/Detector.h"
+#include "sls/Result.h"
+#include "sls/network_utils.h"
+#include "sls/sls_detector_exceptions.h"
 #include <iostream>
 #include <map>
 #include <string>

slsDetectorSoftware/src/Detector.cpp

@@ -1,13 +1,14 @@
-#include "Detector.h"
+#include "sls/Detector.h"
+#include "sls/detectorData.h"
+
 #include "CmdParser.h"
 #include "CmdProxy.h"
 #include "DetectorImpl.h"
 #include "Module.h"
-#include "container_utils.h"
-#include "detectorData.h"
-#include "logger.h"
-#include "sls_detector_defs.h"
-#include "versionAPI.h"
+#include "sls/container_utils.h"
+#include "sls/logger.h"
+#include "sls/sls_detector_defs.h"
+#include "sls/versionAPI.h"
 
 #include <chrono>
 #include <fstream>

slsDetectorSoftware/src/DetectorImpl.cpp

@@ -1,17 +1,17 @@
 #include "DetectorImpl.h"
 #include "Module.h"
 #include "SharedMemory.h"
-#include "ZmqSocket.h"
-#include "detectorData.h"
-#include "file_utils.h"
-#include "logger.h"
-#include "sls_detector_exceptions.h"
-#include "versionAPI.h"
+#include "sls/ZmqSocket.h"
+#include "sls/detectorData.h"
+#include "sls/file_utils.h"
+#include "sls/logger.h"
+#include "sls/sls_detector_exceptions.h"
+#include "sls/versionAPI.h"
 
-#include "ToString.h"
-#include "container_utils.h"
-#include "network_utils.h"
-#include "string_utils.h"
+#include "sls/ToString.h"
+#include "sls/container_utils.h"
+#include "sls/network_utils.h"
+#include "sls/string_utils.h"
 
 #include <cstring>
 #include <iomanip>

slsDetectorSoftware/src/DetectorImpl.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "Result.h"
+#include "sls/Result.h"
 #include "SharedMemory.h"
-#include "logger.h"
-#include "sls_detector_defs.h"
+#include "sls/logger.h"
+#include "sls/sls_detector_defs.h"
 
 class ZmqSocket;
 class detectorData;

slsDetectorSoftware/src/HelpDacs.h

@@ -1,4 +1,4 @@
-#include "string_utils.h"
+#include "sls/string_utils.h"
 
 std::string GetHelpDac(std::string dac) {
     if (sls::is_int(dac)) {

slsDetectorSoftware/src/Module.cpp

@@ -1,14 +1,14 @@
 #include "Module.h"
-#include "ClientSocket.h"
+#include "sls/ClientSocket.h"
 #include "SharedMemory.h"
-#include "ToString.h"
-#include "container_utils.h"
-#include "file_utils.h"
-#include "network_utils.h"
-#include "sls_detector_exceptions.h"
-#include "sls_detector_funcs.h"
-#include "string_utils.h"
-#include "versionAPI.h"
+#include "sls/ToString.h"
+#include "sls/container_utils.h"
+#include "sls/file_utils.h"
+#include "sls/network_utils.h"
+#include "sls/sls_detector_exceptions.h"
+#include "sls/sls_detector_funcs.h"
+#include "sls/string_utils.h"
+#include "sls/versionAPI.h"
 
 #include <algorithm>
 #include <array>

slsDetectorSoftware/src/Module.h

@@ -1,10 +1,10 @@
 #pragma once
-#include "ClientSocket.h"
+#include "sls/ClientSocket.h"
 #include "SharedMemory.h"
-#include "StaticVector.h"
-#include "logger.h"
-#include "network_utils.h"
-#include "sls_detector_defs.h"
+#include "sls/StaticVector.h"
+#include "sls/logger.h"
+#include "sls/network_utils.h"
+#include "sls/sls_detector_defs.h"
 
 #include <array>
 #include <cmath>

slsDetectorSoftware/src/SharedMemory.h

@@ -8,8 +8,8 @@
  *@short functions basic implemenation of shared memory
  */
 
-#include "logger.h"
-#include "sls_detector_exceptions.h"
+#include "sls/logger.h"
+#include "sls/sls_detector_exceptions.h"
 
 #include "stdlib.h"
 #include <cerrno>  // errno