Moving headers into include/sls (#212)

2026-01-15 20:43:45 +01:00 · 2020-11-02 16:05:28 +01:00
parent a57bbc084c
commit a15d8dd30a
199 changed files with 417 additions and 413 deletions
--- a/slsDetectorSoftware/CMakeLists.txt
+++ b/slsDetectorSoftware/CMakeLists.txt
@@ -38,9 +38,9 @@ target_link_libraries(slsDetectorShared


 set(PUBLICHEADERS
-    include/detectorData.h
-    include/Detector.h
-    include/Result.h
+    include/sls/detectorData.h
+    include/sls/Detector.h
+    include/sls/Result.h
 )
 set_target_properties(slsDetectorShared PROPERTIES
    LIBRARY_OUTPUT_NAME SlsDetector
@@ -94,5 +94,5 @@ install(TARGETS slsDetectorShared
    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
 )
--- a/slsDetectorSoftware/include/sls/Detector.h
+++ b/slsDetectorSoftware/include/sls/Detector.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "Result.h"
-#include "network_utils.h"
-#include "sls_detector_defs.h"
+#include "sls/Result.h"
+#include "sls/network_utils.h"
+#include "sls/sls_detector_defs.h"
 #include <chrono>
 #include <map>
 #include <memory>
--- a/slsDetectorSoftware/include/sls/Result.h
+++ b/slsDetectorSoftware/include/sls/Result.h
@@ -13,8 +13,8 @@
 #include <iostream>
 #include <vector>

-#include "ToString.h"
-#include "container_utils.h"
+#include "sls/ToString.h"
+#include "sls/container_utils.h"

 namespace sls {

--- a/slsDetectorSoftware/include/sls/detectorData.h
+++ b/slsDetectorSoftware/include/sls/detectorData.h
--- a/slsDetectorSoftware/src/CmdLineApp.cpp
+++ b/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[]) {
--- a/slsDetectorSoftware/src/CmdParser.cpp
+++ b/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>
--- a/slsDetectorSoftware/src/CmdProxy.cpp
+++ b/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>
--- a/slsDetectorSoftware/src/CmdProxy.h
+++ b/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>
--- a/slsDetectorSoftware/src/Detector.cpp
+++ b/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>
--- a/slsDetectorSoftware/src/DetectorImpl.cpp
+++ b/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>
--- a/slsDetectorSoftware/src/DetectorImpl.h
+++ b/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;
--- a/slsDetectorSoftware/src/HelpDacs.h
+++ b/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)) {
--- a/slsDetectorSoftware/src/Module.cpp
+++ b/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>
--- a/slsDetectorSoftware/src/Module.h
+++ b/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>
--- a/slsDetectorSoftware/src/SharedMemory.h
+++ b/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
--- a/slsDetectorSoftware/tests/test-CmdProxy-chiptestboard.cpp
+++ b/slsDetectorSoftware/tests/test-CmdProxy-chiptestboard.cpp
@@ -1,14 +1,14 @@
 #include "CmdProxy.h"
-#include "Detector.h"
+#include "sls/Detector.h"
 #include "catch.hpp"
-#include "sls_detector_defs.h"
+#include "sls/sls_detector_defs.h"
 #include <sstream>

-#include "Result.h"
-#include "ToString.h"
+#include "sls/Result.h"
+#include "sls/ToString.h"
 #include "test-CmdProxy-global.h"
 #include "tests/globals.h"
-#include "versionAPI.h"
+#include "sls/versionAPI.h"

 using sls::CmdProxy;
 using sls::Detector;
--- a/slsDetectorSoftware/tests/test-CmdProxy-eiger.cpp
+++ b/slsDetectorSoftware/tests/test-CmdProxy-eiger.cpp
@@ -1,14 +1,14 @@
 #include "CmdProxy.h"
-#include "Detector.h"
+#include "sls/Detector.h"
 #include "catch.hpp"
-#include "sls_detector_defs.h"
+#include "sls/sls_detector_defs.h"
 #include <array>
 #include <sstream>
 #include <thread>

 #include "test-CmdProxy-global.h"
 #include "tests/globals.h"
-#include "versionAPI.h"
+#include "sls/versionAPI.h"

 using sls::CmdProxy;
 using sls::Detector;
--- a/slsDetectorSoftware/tests/test-CmdProxy-global.cpp
+++ b/slsDetectorSoftware/tests/test-CmdProxy-global.cpp
@@ -1,6 +1,6 @@
 #include "test-CmdProxy-global.h"
 #include "CmdProxy.h"
-#include "Detector.h"
+#include "sls/Detector.h"
 #include "catch.hpp"
 #include "tests/globals.h"

--- a/slsDetectorSoftware/tests/test-CmdProxy-global.h
+++ b/slsDetectorSoftware/tests/test-CmdProxy-global.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "sls_detector_defs.h"
+#include "sls/sls_detector_defs.h"

 void test_dac(slsDetectorDefs::dacIndex index, const std::string &dacname,
              int dacvalue);
--- a/slsDetectorSoftware/tests/test-CmdProxy-gotthard.cpp
+++ b/slsDetectorSoftware/tests/test-CmdProxy-gotthard.cpp
@@ -1,14 +1,14 @@
 #include "CmdProxy.h"
-#include "Detector.h"
+#include "sls/Detector.h"
 #include "catch.hpp"
-#include "sls_detector_defs.h"
+#include "sls/sls_detector_defs.h"
 #include <sstream>

-#include "Result.h"
-#include "ToString.h"
+#include "sls/Result.h"
+#include "sls/ToString.h"
 #include "test-CmdProxy-global.h"
 #include "tests/globals.h"
-#include "versionAPI.h"
+#include "sls/versionAPI.h"

 using sls::CmdProxy;
 using sls::Detector;
--- a/slsDetectorSoftware/tests/test-CmdProxy-gotthard2.cpp
+++ b/slsDetectorSoftware/tests/test-CmdProxy-gotthard2.cpp
@@ -1,14 +1,14 @@
 #include "CmdProxy.h"
-#include "Detector.h"
+#include "sls/Detector.h"
 #include "catch.hpp"
-#include "sls_detector_defs.h"
+#include "sls/sls_detector_defs.h"
 #include <sstream>

-#include "Result.h"
-#include "ToString.h"
+#include "sls/Result.h"
+#include "sls/ToString.h"
 #include "test-CmdProxy-global.h"
 #include "tests/globals.h"
-#include "versionAPI.h"
+#include "sls/versionAPI.h"

 using sls::CmdProxy;
 using sls::Detector;
--- a/slsDetectorSoftware/tests/test-CmdProxy-jungfrau.cpp
+++ b/slsDetectorSoftware/tests/test-CmdProxy-jungfrau.cpp
@@ -1,12 +1,12 @@
 #include "CmdProxy.h"
-#include "Detector.h"
+#include "sls/Detector.h"
 #include "catch.hpp"
-#include "sls_detector_defs.h"
+#include "sls/sls_detector_defs.h"
 #include <sstream>

 #include "test-CmdProxy-global.h"
 #include "tests/globals.h"
-#include "versionAPI.h"
+#include "sls/versionAPI.h"

 using sls::CmdProxy;
 using sls::Detector;
--- a/slsDetectorSoftware/tests/test-CmdProxy-moench.cpp
+++ b/slsDetectorSoftware/tests/test-CmdProxy-moench.cpp
@@ -1,14 +1,14 @@
 #include "CmdProxy.h"
-#include "Detector.h"
+#include "sls/Detector.h"
 #include "catch.hpp"
-#include "sls_detector_defs.h"
+#include "sls/sls_detector_defs.h"
 #include <sstream>

-#include "Result.h"
-#include "ToString.h"
+#include "sls/Result.h"
+#include "sls/ToString.h"
 #include "test-CmdProxy-global.h"
 #include "tests/globals.h"
-#include "versionAPI.h"
+#include "sls/versionAPI.h"

 using sls::CmdProxy;
 using sls::Detector;
--- a/slsDetectorSoftware/tests/test-CmdProxy-mythen3.cpp
+++ b/slsDetectorSoftware/tests/test-CmdProxy-mythen3.cpp
@@ -1,14 +1,14 @@
 #include "CmdProxy.h"
-#include "Detector.h"
+#include "sls/Detector.h"
 #include "catch.hpp"
-#include "sls_detector_defs.h"
+#include "sls/sls_detector_defs.h"
 #include <sstream>

-#include "Result.h"
-#include "ToString.h"
+#include "sls/Result.h"
+#include "sls/ToString.h"
 #include "test-CmdProxy-global.h"
 #include "tests/globals.h"
-#include "versionAPI.h"
+#include "sls/versionAPI.h"

 using sls::CmdProxy;
 using sls::Detector;
--- a/slsDetectorSoftware/tests/test-CmdProxy-pattern.cpp
+++ b/slsDetectorSoftware/tests/test-CmdProxy-pattern.cpp
@@ -1,14 +1,14 @@
 #include "CmdProxy.h"
-#include "Detector.h"
+#include "sls/Detector.h"
 #include "catch.hpp"
-#include "sls_detector_defs.h"
+#include "sls/sls_detector_defs.h"
 #include <sstream>

-#include "Result.h"
-#include "ToString.h"
+#include "sls/Result.h"
+#include "sls/ToString.h"
 #include "test-CmdProxy-global.h"
 #include "tests/globals.h"
-#include "versionAPI.h"
+#include "sls/versionAPI.h"

 using sls::CmdProxy;
 using sls::Detector;
--- a/slsDetectorSoftware/tests/test-CmdProxy-rx.cpp
+++ b/slsDetectorSoftware/tests/test-CmdProxy-rx.cpp
@@ -1,11 +1,11 @@
 #include "CmdProxy.h"
-#include "Detector.h"
+#include "sls/Detector.h"
 #include "catch.hpp"
-#include "sls_detector_defs.h"
+#include "sls/sls_detector_defs.h"
 #include <sstream>

 #include "tests/globals.h"
-#include "versionAPI.h"
+#include "sls/versionAPI.h"

 using sls::CmdProxy;
 using sls::Detector;
--- a/slsDetectorSoftware/tests/test-CmdProxy.cpp
+++ b/slsDetectorSoftware/tests/test-CmdProxy.cpp
@@ -1,7 +1,7 @@
 #include "CmdProxy.h"
-#include "Detector.h"
+#include "sls/Detector.h"
 #include "catch.hpp"
-#include "sls_detector_defs.h"
+#include "sls/sls_detector_defs.h"

 #include <chrono>
 #include <sstream>
--- a/slsDetectorSoftware/tests/test-Result.cpp
+++ b/slsDetectorSoftware/tests/test-Result.cpp
@@ -1,6 +1,6 @@
-#include "Result.h"
-#include "ToString.h"
-#include "TypeTraits.h"
+#include "sls/Result.h"
+#include "sls/ToString.h"
+#include "sls/TypeTraits.h"
 #include "catch.hpp"
 #include <string>

--- a/slsDetectorSoftware/tests/test-SharedMemory.cpp
+++ b/slsDetectorSoftware/tests/test-SharedMemory.cpp
@@ -1,7 +1,7 @@

 #include "SharedMemory.h"
 #include "catch.hpp"
-#include "string_utils.h"
+#include "sls/string_utils.h"

 #include <iostream>

--- a/slsDetectorSoftware/tests/test-slsDetector.cpp
+++ b/slsDetectorSoftware/tests/test-slsDetector.cpp
@@ -1,9 +1,9 @@

 // #include "catch.hpp"
-// #include "container_utils.h"
+// #include "sls/container_utils.h"
 // #include "slsDetector.h"
-// #include "sls_detector_defs.h"
-// #include "string_utils.h"
+// #include "sls/sls_detector_defs.h"
+// #include "sls/string_utils.h"
 // #include <algorithm>
 // #include <iostream>