diff --git a/conda-recepie/copy_lib.sh b/conda-recepie/copy_lib.sh index 7042ccf2c..9136a480b 100755 --- a/conda-recepie/copy_lib.sh +++ b/conda-recepie/copy_lib.sh @@ -1,8 +1,8 @@ mkdir $PREFIX/lib mkdir $PREFIX/bin -mkdir $PREFIX/include -mkdir $PREFIX/include/slsDetectorPackage +mkdir -p $PREFIX/include/sls +# mkdir $PREFIX/include/slsDetectorPackage #Shared and static libraries # cp build/bin/libSlsDetector.so $PREFIX/lib/. @@ -20,5 +20,5 @@ cp build/install/bin/slsReceiver $PREFIX/bin/. cp build/install/bin/slsMultiReceiver $PREFIX/bin/. -cp build/install/include/* $PREFIX/include/ +cp build/install/include/sls/* $PREFIX/include/sls cp -r build/install/share/ $PREFIX/share diff --git a/ctbGui/ctbAcquisition.cpp b/ctbGui/ctbAcquisition.cpp index b2e74e533..e2968ca4b 100755 --- a/ctbGui/ctbAcquisition.cpp +++ b/ctbGui/ctbAcquisition.cpp @@ -25,8 +25,8 @@ #include "ctbAcquisition.h" #include "ctbDefs.h" -#include "Detector.h" -#include "sls_detector_defs.h" +#include "sls/Detector.h" +#include "sls/sls_detector_defs.h" #include "ctbMain.h" #include "moench03CtbData.h" //#include "moench03TCtbData.h" @@ -43,7 +43,7 @@ #include "moench04CtbZmqData.h" #include "moench04CtbZmq10GbData.h" #include "deserializer.h" -#include "detectorData.h" +#include "sls/detectorData.h" #include "imageZmq16bit.h" #include "imageZmq32bit.h" diff --git a/ctbGui/ctbAdcs.cpp b/ctbGui/ctbAdcs.cpp index b26a652db..dbf2b4e63 100755 --- a/ctbGui/ctbAdcs.cpp +++ b/ctbGui/ctbAdcs.cpp @@ -25,7 +25,7 @@ #include "ctbAdcs.h" #include "ctbDefs.h" -#include "Detector.h" +#include "sls/Detector.h" using namespace std; diff --git a/ctbGui/ctbDacs.cpp b/ctbGui/ctbDacs.cpp index b033401f3..f386492f6 100755 --- a/ctbGui/ctbDacs.cpp +++ b/ctbGui/ctbDacs.cpp @@ -10,8 +10,8 @@ #include "ctbDacs.h" #include "ctbDefs.h" -#include "Detector.h" -#include "sls_detector_defs.h" +#include "sls/Detector.h" +#include "sls/sls_detector_defs.h" using namespace std; diff --git a/ctbGui/ctbDefs.h b/ctbGui/ctbDefs.h index 83e06f2ac..6cfad7fa1 100755 --- a/ctbGui/ctbDefs.h +++ b/ctbGui/ctbDefs.h @@ -4,8 +4,8 @@ #include #include -//#include "sls_detector_exceptions.h" -//#include "ansi.h" +//#include "sls/sls_detector_exceptions.h" +//#include "sls/ansi.h" #define RED "\x1b[31m" #define RESET "\x1b[0m" #define BOLD "\x1b[1m" diff --git a/ctbGui/ctbGui.cpp b/ctbGui/ctbGui.cpp index 1ef99b8f1..50df983eb 100755 --- a/ctbGui/ctbGui.cpp +++ b/ctbGui/ctbGui.cpp @@ -9,8 +9,8 @@ #include #include -#include "Detector.h" -#include "sls_detector_defs.h" +#include "sls/Detector.h" +#include "sls/sls_detector_defs.h" //#include "sls_receiver_defs.h" #include "ctbMain.h" #include "ctbDefs.h" diff --git a/ctbGui/ctbMain.cpp b/ctbGui/ctbMain.cpp index 393377b77..d5d698e74 100755 --- a/ctbGui/ctbMain.cpp +++ b/ctbGui/ctbMain.cpp @@ -34,7 +34,7 @@ #include #include -#include "Detector.h" +#include "sls/Detector.h" #include "ctbDefs.h" #include "ctbMain.h" #include "ctbDacs.h" diff --git a/ctbGui/ctbPattern.cpp b/ctbGui/ctbPattern.cpp index e8c4d6b60..7e902db50 100755 --- a/ctbGui/ctbPattern.cpp +++ b/ctbGui/ctbPattern.cpp @@ -25,7 +25,7 @@ #include "ctbPattern.h" #include "ctbDefs.h" -#include "Detector.h" +#include "sls/Detector.h" #include using namespace std; diff --git a/ctbGui/ctbPowers.cpp b/ctbGui/ctbPowers.cpp index 476235f33..42a3eca81 100644 --- a/ctbGui/ctbPowers.cpp +++ b/ctbGui/ctbPowers.cpp @@ -13,8 +13,8 @@ #include "ctbDefs.h" #include "ctbDacs.h" #include "ctbPowers.h" -#include "Detector.h" -#include "sls_detector_defs.h" +#include "sls/Detector.h" +#include "sls/sls_detector_defs.h" using namespace std; diff --git a/ctbGui/ctbSignals.cpp b/ctbGui/ctbSignals.cpp index 47237be47..84cd221fc 100755 --- a/ctbGui/ctbSignals.cpp +++ b/ctbGui/ctbSignals.cpp @@ -35,7 +35,7 @@ #include "ctbSignals.h" #include "ctbDefs.h" -#include "Detector.h" +#include "sls/Detector.h" using namespace std; diff --git a/ctbGui/ctbSlowAdcs.cpp b/ctbGui/ctbSlowAdcs.cpp index af88f987c..8228fe117 100644 --- a/ctbGui/ctbSlowAdcs.cpp +++ b/ctbGui/ctbSlowAdcs.cpp @@ -10,8 +10,8 @@ #include "ctbSlowAdcs.h" #include "ctbDefs.h" -#include "Detector.h" -#include "sls_detector_defs.h" +#include "sls/Detector.h" +#include "sls/sls_detector_defs.h" using namespace std; diff --git a/docs/src/consuming.rst b/docs/src/consuming.rst index ab91670c6..ccf1453db 100644 --- a/docs/src/consuming.rst +++ b/docs/src/consuming.rst @@ -91,7 +91,7 @@ manually when invoking g++. This can sometimes be handy for a quick try. .. code-block:: cpp - #include "Detector.h" + #include "sls/Detector.h" #include int main(){ diff --git a/docs/src/examples.rst b/docs/src/examples.rst index eded0122a..d22f3bc6d 100644 --- a/docs/src/examples.rst +++ b/docs/src/examples.rst @@ -36,7 +36,7 @@ Running a config file [e1] .. code-block:: cpp - #include "Detector.h" + #include "sls/Detector.h" ... sls::Detector det; det.loadConfig("path/to/config/file.config"); @@ -105,7 +105,7 @@ as converting to floating point. .. code-block:: cpp - #include "Detector.h" + #include "sls/Detector.h" #include ... std::chrono::microseconds t0{500}; diff --git a/docs/src/gendoc.cpp b/docs/src/gendoc.cpp index f0f38f867..f63c4c5d5 100644 --- a/docs/src/gendoc.cpp +++ b/docs/src/gendoc.cpp @@ -10,8 +10,8 @@ #include #include "CmdProxy.h" -#include "Detector.h" -#include "sls_detector_defs.h" +#include "sls/Detector.h" +#include "sls/sls_detector_defs.h" std::string replace_all(const std::string &src, const std::string &from, const std::string &to) { diff --git a/integrationTests/test-eigerIntegration.cpp b/integrationTests/test-eigerIntegration.cpp index c17d1b059..a02b85677 100644 --- a/integrationTests/test-eigerIntegration.cpp +++ b/integrationTests/test-eigerIntegration.cpp @@ -1,6 +1,6 @@ #include "DetectorImpl.h" #include "catch.hpp" -#include "string_utils.h" +#include "sls/string_utils.h" #include "tests/globals.h" #include diff --git a/integrationTests/test-integrationDectector.cpp b/integrationTests/test-integrationDectector.cpp index 2d22ed333..70cb17863 100644 --- a/integrationTests/test-integrationDectector.cpp +++ b/integrationTests/test-integrationDectector.cpp @@ -1,14 +1,14 @@ #include "catch.hpp" -#include "ClientSocket.h" +#include "sls/ClientSocket.h" #include "DetectorImpl.h" #include "Module.h" -#include "logger.h" -#include "sls_detector_defs.h" +#include "sls/logger.h" +#include "sls/sls_detector_defs.h" -#include "Timer.h" -#include "sls_detector_funcs.h" +#include "sls/Timer.h" +#include "sls/sls_detector_funcs.h" #include #include #define VERBOSE diff --git a/integrationTests/test-integrationMulti.cpp b/integrationTests/test-integrationMulti.cpp index 489fe9fea..eaa5edd11 100644 --- a/integrationTests/test-integrationMulti.cpp +++ b/integrationTests/test-integrationMulti.cpp @@ -1,6 +1,6 @@ #include "DetectorImpl.h" #include "catch.hpp" -#include "string_utils.h" +#include "sls/string_utils.h" #include "tests/globals.h" #include diff --git a/python/src/detector.cpp b/python/src/detector.cpp index 67976f21a..511b086cb 100644 --- a/python/src/detector.cpp +++ b/python/src/detector.cpp @@ -6,13 +6,13 @@ #include #include -#include "Detector.h" -#include "ToString.h" -#include "network_utils.h" -#include "sls_detector_defs.h" +#include "sls/Detector.h" +#include "sls/ToString.h" +#include "sls/network_utils.h" +#include "sls/sls_detector_defs.h" #include "typecaster.h" -#include "TimeHelper.h" +#include "sls/TimeHelper.h" #include #include namespace py = pybind11; diff --git a/python/src/detector_in.cpp b/python/src/detector_in.cpp index 810218104..c08cdf764 100644 --- a/python/src/detector_in.cpp +++ b/python/src/detector_in.cpp @@ -3,13 +3,13 @@ #include #include -#include "Detector.h" -#include "ToString.h" -#include "network_utils.h" -#include "sls_detector_defs.h" +#include "sls/Detector.h" +#include "sls/ToString.h" +#include "sls/network_utils.h" +#include "sls/sls_detector_defs.h" #include "typecaster.h" -#include "TimeHelper.h" +#include "sls/TimeHelper.h" #include #include namespace py = pybind11; diff --git a/python/src/enums.cpp b/python/src/enums.cpp index 2c854eca0..e42c63339 100644 --- a/python/src/enums.cpp +++ b/python/src/enums.cpp @@ -6,7 +6,7 @@ #include #include -#include "sls_detector_defs.h" +#include "sls/sls_detector_defs.h" namespace py = pybind11; void init_enums(py::module &m) { py::class_ Defs(m, "slsDetectorDefs"); diff --git a/python/src/enums_in.cpp b/python/src/enums_in.cpp index b62fc6cdd..2e21b2d58 100644 --- a/python/src/enums_in.cpp +++ b/python/src/enums_in.cpp @@ -3,7 +3,7 @@ #include #include -#include "sls_detector_defs.h" +#include "sls/sls_detector_defs.h" namespace py = pybind11; void init_enums(py::module &m) { py::class_ Defs(m, "slsDetectorDefs"); diff --git a/python/src/main.cpp b/python/src/main.cpp index 48bd1bb06..e199d6efd 100755 --- a/python/src/main.cpp +++ b/python/src/main.cpp @@ -3,8 +3,8 @@ #include #include -#include "Detector.h" -#include "Result.h" +#include "sls/Detector.h" +#include "sls/Result.h" #include "mythenFileIO.h" #include #include diff --git a/python/src/network.cpp b/python/src/network.cpp index c1b3bdc45..8130c3e96 100644 --- a/python/src/network.cpp +++ b/python/src/network.cpp @@ -9,7 +9,7 @@ classes. #include #include -#include "network_utils.h" +#include "sls/network_utils.h" namespace py = pybind11; using sls::IpAddr; using sls::MacAddr; diff --git a/python/src/typecaster.h b/python/src/typecaster.h index c5a9bfc6d..15f884b45 100644 --- a/python/src/typecaster.h +++ b/python/src/typecaster.h @@ -1,6 +1,6 @@ #pragma once #include -#include "Result.h" +#include "sls/Result.h" // Add type_typecaster to pybind for our wrapper type namespace pybind11 { namespace detail { diff --git a/sample/api.cpp b/sample/api.cpp index f353faf0a..705fba788 100644 --- a/sample/api.cpp +++ b/sample/api.cpp @@ -1,9 +1,9 @@ -#include "Detector.h" +#include #include #include -#include "TimeHelper.h" -#include "ToString.h" +#include "sls/TimeHelper.h" +#include "sls/ToString.h" // std::ostream &operator<<(std::ostream &os, const std::chrono::nanoseconds &t) { // os << t.count() << "ns"; // return os; diff --git a/sample/time.cpp b/sample/time.cpp index 20e7c4e6e..96f10e349 100644 --- a/sample/time.cpp +++ b/sample/time.cpp @@ -3,10 +3,10 @@ #include #include -#include "Result.h" -#include "Detector.h" -#include "container_utils.h" -#include "ToString.h" +#include "sls/Result.h" +#include "sls/Detector.h" +#include "sls/container_utils.h" +#include "sls/ToString.h" #include std::chrono::nanoseconds to_nano(double val, const std::string &unit) { diff --git a/sample/udp.cpp b/sample/udp.cpp index dc301ffb9..b647992c9 100644 --- a/sample/udp.cpp +++ b/sample/udp.cpp @@ -1,10 +1,10 @@ -#include "UdpRxSocket.h" -#include "sls_detector_defs.h" +#include "sls/UdpRxSocket.h" +#include "sls/sls_detector_defs.h" #include #include #include #include -#include "network_utils.h" +#include "sls/network_utils.h" // Assume packages arrive in order diff --git a/sample/useResult.cpp b/sample/useResult.cpp index 4a37ce0f6..e7944f628 100644 --- a/sample/useResult.cpp +++ b/sample/useResult.cpp @@ -1,7 +1,7 @@ /** Examples on how to use Result */ -#include "Result.h" -#include "ToString.h" +#include "sls/Result.h" +#include "sls/ToString.h" #include #include diff --git a/sample/using_logger.cpp b/sample/using_logger.cpp index 0e5bc7397..ec46588af 100644 --- a/sample/using_logger.cpp +++ b/sample/using_logger.cpp @@ -1,4 +1,4 @@ -#include "logger.h" +#include "sls/logger.h" #include #include int main() { diff --git a/slsDetectorCalibration/moenchExecutables/CMakeLists.txt b/slsDetectorCalibration/moenchExecutables/CMakeLists.txt index f644f9978..e6d4577e1 100644 --- a/slsDetectorCalibration/moenchExecutables/CMakeLists.txt +++ b/slsDetectorCalibration/moenchExecutables/CMakeLists.txt @@ -1,4 +1,5 @@ +find_package(TIFF REQUIRED) #Moench ZMQ add_executable(moenchZmqProcess moenchZmqProcess.cpp ../tiffIO.cpp) diff --git a/slsDetectorCalibration/moenchExecutables/moench03ClusterFinder.cpp b/slsDetectorCalibration/moenchExecutables/moench03ClusterFinder.cpp index e05f9d38b..36a6675af 100644 --- a/slsDetectorCalibration/moenchExecutables/moench03ClusterFinder.cpp +++ b/slsDetectorCalibration/moenchExecutables/moench03ClusterFinder.cpp @@ -1,4 +1,4 @@ -//#include "ansi.h" +//#include "sls/ansi.h" #include diff --git a/slsDetectorCalibration/moenchExecutables/moench03Interpolation.cpp b/slsDetectorCalibration/moenchExecutables/moench03Interpolation.cpp index 079e44b83..eeeed90c6 100644 --- a/slsDetectorCalibration/moenchExecutables/moench03Interpolation.cpp +++ b/slsDetectorCalibration/moenchExecutables/moench03Interpolation.cpp @@ -1,5 +1,5 @@ -#include "ansi.h" +#include "sls/ansi.h" #include //#include "moench03T1ZmqData.h" diff --git a/slsDetectorCalibration/moenchExecutables/moench03NoInterpolation.cpp b/slsDetectorCalibration/moenchExecutables/moench03NoInterpolation.cpp index 8d880c509..b07985ec9 100644 --- a/slsDetectorCalibration/moenchExecutables/moench03NoInterpolation.cpp +++ b/slsDetectorCalibration/moenchExecutables/moench03NoInterpolation.cpp @@ -1,5 +1,5 @@ -#include "ansi.h" +#include "sls/ansi.h" #include #include "single_photon_hit.h" diff --git a/slsDetectorCalibration/moenchExecutables/moenchPhotonCounter.cpp b/slsDetectorCalibration/moenchExecutables/moenchPhotonCounter.cpp index 4d0a9a40e..7b765bd5e 100644 --- a/slsDetectorCalibration/moenchExecutables/moenchPhotonCounter.cpp +++ b/slsDetectorCalibration/moenchExecutables/moenchPhotonCounter.cpp @@ -1,4 +1,4 @@ -//#include "ansi.h" +//#include "sls/ansi.h" #include #define CORR diff --git a/slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp b/slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp index 12e92586f..47e424306 100644 --- a/slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp +++ b/slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp @@ -5,8 +5,8 @@ #define CM_ROWS 20 -#include "sls_detector_defs.h" -#include "ZmqSocket.h" +#include "sls/sls_detector_defs.h" +#include "sls/ZmqSocket.h" #ifndef RECT #ifndef MOENCH04 #include "moench03T1ZmqDataNew.h" @@ -39,7 +39,7 @@ //#include "multiThreadedCountingDetector.h" #include "multiThreadedInterpolatingDetector.h" #include "etaInterpolationPosXY.h" -#include "ansi.h" +#include "sls/ansi.h" #include #include diff --git a/slsDetectorCalibration/multiThreadedAnalogDetector.h b/slsDetectorCalibration/multiThreadedAnalogDetector.h index f33f210fb..dcdab30f5 100644 --- a/slsDetectorCalibration/multiThreadedAnalogDetector.h +++ b/slsDetectorCalibration/multiThreadedAnalogDetector.h @@ -17,7 +17,7 @@ #include #include "analogDetector.h" -#include "CircularFifo.h" +#include "sls/CircularFifo.h" #include #include #include diff --git a/slsDetectorGui/include/qDacWidget.h b/slsDetectorGui/include/qDacWidget.h index a903b4807..8925e1c32 100644 --- a/slsDetectorGui/include/qDacWidget.h +++ b/slsDetectorGui/include/qDacWidget.h @@ -1,6 +1,6 @@ #pragma once -#include "Detector.h" -#include "sls_detector_defs.h" +#include "sls/Detector.h" +#include "sls/sls_detector_defs.h" #include "ui_form_dac.h" #include diff --git a/slsDetectorGui/include/qDefs.h b/slsDetectorGui/include/qDefs.h index fd053c248..4364e3b3b 100644 --- a/slsDetectorGui/include/qDefs.h +++ b/slsDetectorGui/include/qDefs.h @@ -1,7 +1,7 @@ #pragma once -#include "logger.h" -#include "sls_detector_defs.h" +#include "sls/logger.h" +#include "sls/sls_detector_defs.h" #include #include diff --git a/slsDetectorGui/include/qDetectorMain.h b/slsDetectorGui/include/qDetectorMain.h index 9f6b77756..cfb153aa8 100644 --- a/slsDetectorGui/include/qDetectorMain.h +++ b/slsDetectorGui/include/qDetectorMain.h @@ -1,5 +1,5 @@ #pragma once -#include "Detector.h" +#include "sls/Detector.h" #include "qDefs.h" #include "ui_form_detectormain.h" #include diff --git a/slsDetectorGui/include/qDrawPlot.h b/slsDetectorGui/include/qDrawPlot.h index 3c3b43873..205870d88 100644 --- a/slsDetectorGui/include/qDrawPlot.h +++ b/slsDetectorGui/include/qDrawPlot.h @@ -1,5 +1,5 @@ #pragma once -#include "Detector.h" +#include "sls/Detector.h" #include "qDefs.h" #include "ui_form_plot.h" #include diff --git a/slsDetectorGui/include/qTabAdvanced.h b/slsDetectorGui/include/qTabAdvanced.h index ba4ff2a0e..355beab05 100644 --- a/slsDetectorGui/include/qTabAdvanced.h +++ b/slsDetectorGui/include/qTabAdvanced.h @@ -1,5 +1,5 @@ #pragma once -#include "Detector.h" +#include "sls/Detector.h" #include "ui_form_tab_advanced.h" class qDrawPlot; diff --git a/slsDetectorGui/include/qTabDataOutput.h b/slsDetectorGui/include/qTabDataOutput.h index a1ca5e513..8f753a6db 100644 --- a/slsDetectorGui/include/qTabDataOutput.h +++ b/slsDetectorGui/include/qTabDataOutput.h @@ -1,5 +1,5 @@ #pragma once -#include "Detector.h" +#include "sls/Detector.h" #include "ui_form_tab_dataoutput.h" class qTabDataOutput : public QWidget, private Ui::TabDataOutputObject { diff --git a/slsDetectorGui/include/qTabDebugging.h b/slsDetectorGui/include/qTabDebugging.h index 4aa4b6a49..412046914 100644 --- a/slsDetectorGui/include/qTabDebugging.h +++ b/slsDetectorGui/include/qTabDebugging.h @@ -1,5 +1,5 @@ #pragma once -#include "Detector.h" +#include "sls/Detector.h" #include "ui_form_tab_debugging.h" class QTreeWidget; diff --git a/slsDetectorGui/include/qTabDeveloper.h b/slsDetectorGui/include/qTabDeveloper.h index 1c6ba3996..be3d25c4c 100644 --- a/slsDetectorGui/include/qTabDeveloper.h +++ b/slsDetectorGui/include/qTabDeveloper.h @@ -1,6 +1,6 @@ #pragma once -#include "Detector.h" -#include "sls_detector_defs.h" +#include "sls/Detector.h" +#include "sls/sls_detector_defs.h" #include "ui_form_tab_developer.h" #include diff --git a/slsDetectorGui/include/qTabMeasurement.h b/slsDetectorGui/include/qTabMeasurement.h index 3d8e5b844..1526cff08 100644 --- a/slsDetectorGui/include/qTabMeasurement.h +++ b/slsDetectorGui/include/qTabMeasurement.h @@ -1,5 +1,5 @@ #pragma once -#include "Detector.h" +#include "sls/Detector.h" #include "ui_form_tab_measurement.h" class qDrawPlot; diff --git a/slsDetectorGui/include/qTabPlot.h b/slsDetectorGui/include/qTabPlot.h index c87d173a5..c146d07d9 100644 --- a/slsDetectorGui/include/qTabPlot.h +++ b/slsDetectorGui/include/qTabPlot.h @@ -1,5 +1,5 @@ #pragma once -#include "Detector.h" +#include "sls/Detector.h" #include "ui_form_tab_plot.h" class qDrawPlot; diff --git a/slsDetectorGui/include/qTabSettings.h b/slsDetectorGui/include/qTabSettings.h index f1a7f4151..6d73488a4 100644 --- a/slsDetectorGui/include/qTabSettings.h +++ b/slsDetectorGui/include/qTabSettings.h @@ -1,5 +1,5 @@ #pragma once -#include "Detector.h" +#include "sls/Detector.h" #include "ui_form_tab_settings.h" class qTabSettings : public QWidget, private Ui::TabSettingsObject { diff --git a/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h b/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h index 80fcbc417..da0dac1d1 100644 --- a/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h +++ b/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h @@ -2,7 +2,7 @@ #define SLSQT1DPLOT_H #include "SlsQt1DZoomer.h" -#include "ansi.h" +#include "sls/ansi.h" #include #include #include diff --git a/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DHist.cpp b/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DHist.cpp index dc8e6dcbb..ade86d47c 100644 --- a/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DHist.cpp +++ b/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DHist.cpp @@ -1,6 +1,6 @@ /* TODO! short description */ #include "SlsQt2DHist.h" -#include "ansi.h" +#include "sls/ansi.h" #include #include diff --git a/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DPlot.cpp b/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DPlot.cpp index 6b6286997..e00c93743 100644 --- a/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DPlot.cpp +++ b/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DPlot.cpp @@ -1,5 +1,5 @@ #include "SlsQt2DPlot.h" -// #include "ansi.h" +// #include "sls/ansi.h" #include #include diff --git a/slsDetectorGui/src/qDetectorMain.cpp b/slsDetectorGui/src/qDetectorMain.cpp index b1017ca7a..7ac03002e 100644 --- a/slsDetectorGui/src/qDetectorMain.cpp +++ b/slsDetectorGui/src/qDetectorMain.cpp @@ -10,8 +10,8 @@ #include "qTabPlot.h" #include "qTabSettings.h" -#include "ToString.h" -#include "versionAPI.h" +#include "sls/ToString.h" +#include "sls/versionAPI.h" #include #include diff --git a/slsDetectorGui/src/qDrawPlot.cpp b/slsDetectorGui/src/qDrawPlot.cpp index 9f493787a..2f6cbcfc2 100644 --- a/slsDetectorGui/src/qDrawPlot.cpp +++ b/slsDetectorGui/src/qDrawPlot.cpp @@ -1,11 +1,11 @@ #include "qDrawPlot.h" #include "SlsQt1DPlot.h" #include "SlsQt2DPlot.h" -#include "detectorData.h" +#include "sls/detectorData.h" #include "qCloneWidget.h" -#include "ToString.h" -#include "detectorData.h" +#include "sls/ToString.h" +#include "sls/detectorData.h" #include #include diff --git a/slsDetectorGui/src/qTabAdvanced.cpp b/slsDetectorGui/src/qTabAdvanced.cpp index 1a3353f16..6c0ddf168 100644 --- a/slsDetectorGui/src/qTabAdvanced.cpp +++ b/slsDetectorGui/src/qTabAdvanced.cpp @@ -1,5 +1,5 @@ #include "qTabAdvanced.h" -#include "network_utils.h" +#include "sls/network_utils.h" #include "qDefs.h" #include "qDrawPlot.h" diff --git a/slsDetectorGui/src/qTabDebugging.cpp b/slsDetectorGui/src/qTabDebugging.cpp index 1482f5587..07dc1673b 100644 --- a/slsDetectorGui/src/qTabDebugging.cpp +++ b/slsDetectorGui/src/qTabDebugging.cpp @@ -1,5 +1,5 @@ #include "qTabDebugging.h" -#include "ToString.h" +#include "sls/ToString.h" #include "qDefs.h" #include #include diff --git a/slsDetectorGui/src/qTabMeasurement.cpp b/slsDetectorGui/src/qTabMeasurement.cpp index b5061c70e..679b10e53 100644 --- a/slsDetectorGui/src/qTabMeasurement.cpp +++ b/slsDetectorGui/src/qTabMeasurement.cpp @@ -1,7 +1,7 @@ #include "qTabMeasurement.h" #include "qDefs.h" #include "qDrawPlot.h" -#include "string_utils.h" +#include "sls/string_utils.h" #include #include diff --git a/slsDetectorGui/src/qTabSettings.cpp b/slsDetectorGui/src/qTabSettings.cpp index 9f51b1922..77c2f4462 100644 --- a/slsDetectorGui/src/qTabSettings.cpp +++ b/slsDetectorGui/src/qTabSettings.cpp @@ -1,5 +1,5 @@ #include "qTabSettings.h" -#include "ToString.h" +#include "sls/ToString.h" #include "qDefs.h" #include diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c index 869fdd023..bffdae970 100644 --- a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c @@ -1,7 +1,7 @@ #include "slsDetectorFunctionList.h" #include "clogger.h" #include "sharedMemory.h" -#include "versionAPI.h" +#include "sls/versionAPI.h" #include "AD7689.h" // slow adcs #include "ALTERA_PLL.h" // pll diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h index a1c30522a..a878e5d22 100644 --- a/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h @@ -1,6 +1,6 @@ #pragma once #include "RegisterDefs.h" -#include "sls_detector_defs.h" +#include "sls/sls_detector_defs.h" #define MIN_REQRD_VRSN_T_RD_API 0x181130 #define REQRD_FRMWR_VRSN 0x201005 diff --git a/slsDetectorServers/eigerDetectorServer/9mhvserial_bf.c b/slsDetectorServers/eigerDetectorServer/9mhvserial_bf.c index a402cbc0a..4a79ae522 100644 --- a/slsDetectorServers/eigerDetectorServer/9mhvserial_bf.c +++ b/slsDetectorServers/eigerDetectorServer/9mhvserial_bf.c @@ -1,4 +1,4 @@ -#include "ansi.h" +#include "sls/ansi.h" #include #include // File control definitions diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c index f1e0cb6a0..e363da9f5 100644 --- a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c @@ -2,7 +2,7 @@ #include "clogger.h" #include "common.h" #include "sharedMemory.h" -#include "versionAPI.h" +#include "sls/versionAPI.h" #ifndef VIRTUAL #include "Beb.h" diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h index b7f0104ea..a4c350c68 100644 --- a/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h @@ -1,5 +1,5 @@ #pragma once -#include "sls_detector_defs.h" +#include "sls/sls_detector_defs.h" #define REQUIRED_FIRMWARE_VERSION (27) #define IDFILECOMMAND "more /home/root/executables/detid.txt" diff --git a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c index 99002cb46..7e9a0214a 100644 --- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c @@ -7,7 +7,7 @@ #include "clogger.h" #include "common.h" #include "sharedMemory.h" -#include "versionAPI.h" +#include "sls/versionAPI.h" #ifdef VIRTUAL #include "communication_funcs_UDP.h" #endif diff --git a/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h index d78bf98cc..43a427489 100644 --- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h @@ -1,5 +1,5 @@ #pragma once -#include "sls_detector_defs.h" +#include "sls/sls_detector_defs.h" #define REQRD_FRMWRE_VRSN (0x200925) #define KERNEL_DATE_VRSN "Wed May 20 13:58:38 CEST 2020" diff --git a/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c index 1c25cd20e..f7e8842a6 100644 --- a/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c @@ -3,7 +3,7 @@ #include "clogger.h" #include "common.h" #include "sharedMemory.h" -#include "versionAPI.h" +#include "sls/versionAPI.h" #include "LTC2620.h" // dacs #ifdef VIRTUAL diff --git a/slsDetectorServers/gotthardDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/gotthardDetectorServer/slsDetectorServer_defs.h index 65f1030ca..f88039230 100644 --- a/slsDetectorServers/gotthardDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/gotthardDetectorServer/slsDetectorServer_defs.h @@ -1,5 +1,5 @@ #pragma once -#include "sls_detector_defs.h" +#include "sls/sls_detector_defs.h" #include /* Enums */ diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c index c33635f4f..b9a1627f4 100644 --- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c @@ -1,7 +1,7 @@ #include "slsDetectorFunctionList.h" #include "clogger.h" #include "sharedMemory.h" -#include "versionAPI.h" +#include "sls/versionAPI.h" #include "ALTERA_PLL.h" // pll #include "LTC2620.h" // dacs diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h index 7094040b1..bfc832636 100644 --- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h @@ -1,6 +1,6 @@ #pragma once #include "RegisterDefs.h" -#include "sls_detector_defs.h" +#include "sls/sls_detector_defs.h" #define MIN_REQRD_VRSN_T_RD_API 0x171220 #define REQRD_FRMWRE_VRSN_BOARD2 0x200724 // 1.0 pcb diff --git a/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c index f3644e0d8..d0faa1020 100644 --- a/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c @@ -1,7 +1,7 @@ #include "slsDetectorFunctionList.h" #include "clogger.h" #include "sharedMemory.h" -#include "versionAPI.h" +#include "sls/versionAPI.h" #include "ALTERA_PLL.h" // pll #include "LTC2620.h" // dacs diff --git a/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h index 79bcce056..aa17e8047 100644 --- a/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h @@ -1,6 +1,6 @@ #pragma once #include "RegisterDefs.h" -#include "sls_detector_defs.h" +#include "sls/sls_detector_defs.h" #define MIN_REQRD_VRSN_T_RD_API 0x180314 #define REQRD_FRMWR_VRSN 0x201005 diff --git a/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c index 62a6d6a7c..3f432db9d 100644 --- a/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c @@ -6,7 +6,7 @@ #include "clogger.h" #include "common.h" #include "sharedMemory.h" -#include "versionAPI.h" +#include "sls/versionAPI.h" #ifdef VIRTUAL #include "communication_funcs_UDP.h" #endif diff --git a/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h index 41ea0ec59..1b8c63b9e 100644 --- a/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h @@ -1,5 +1,5 @@ #pragma once -#include "sls_detector_defs.h" +#include "sls/sls_detector_defs.h" #define REQRD_FRMWRE_VRSN (0x200925) #define KERNEL_DATE_VRSN "Wed May 20 13:58:38 CEST 2020" diff --git a/slsDetectorServers/slsDetectorServer/include/clogger.h b/slsDetectorServers/slsDetectorServer/include/clogger.h index 29ba4480f..cfcb63f07 100644 --- a/slsDetectorServers/slsDetectorServer/include/clogger.h +++ b/slsDetectorServers/slsDetectorServer/include/clogger.h @@ -1,6 +1,6 @@ #pragma once -#include "ansi.h" +#include "sls/ansi.h" #include #include diff --git a/slsDetectorServers/slsDetectorServer/include/communication_funcs.h b/slsDetectorServers/slsDetectorServer/include/communication_funcs.h index e41283484..21e59476a 100644 --- a/slsDetectorServers/slsDetectorServer/include/communication_funcs.h +++ b/slsDetectorServers/slsDetectorServer/include/communication_funcs.h @@ -1,7 +1,7 @@ #ifndef COMMUNICATION_FUNCS_H #define COMMUNICATION_FUNCS_H -#include "sls_detector_defs.h" +#include "sls/sls_detector_defs.h" typedef enum { INT16, INT32, INT64, OTHER } intType; diff --git a/slsDetectorServers/slsDetectorServer/include/sharedMemory.h b/slsDetectorServers/slsDetectorServer/include/sharedMemory.h index 6bcc2dabf..8146dfbc1 100644 --- a/slsDetectorServers/slsDetectorServer/include/sharedMemory.h +++ b/slsDetectorServers/slsDetectorServer/include/sharedMemory.h @@ -1,5 +1,5 @@ #pragma once -#include "sls_detector_defs.h" +#include "sls/sls_detector_defs.h" void sharedMemory_print(); int sharedMemory_create(int port); diff --git a/slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h b/slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h index c63064d9f..6a7382ead 100644 --- a/slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h +++ b/slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h @@ -1,5 +1,5 @@ #include "slsDetectorServer_defs.h" // DAC_INDEX, ADC_INDEX, also include RegisterDefs.h -#include "sls_detector_defs.h" +#include "sls/sls_detector_defs.h" #ifdef GOTTHARDD #include "AD9252.h" // old board compatibility #include "clogger.h" // runState(enum TLogLevel) diff --git a/slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h b/slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h index a445323ee..c30591de7 100644 --- a/slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h +++ b/slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h @@ -1,6 +1,6 @@ #pragma once #include "clogger.h" -#include "sls_detector_defs.h" +#include "sls/sls_detector_defs.h" enum numberMode { DEC, HEX }; #define GOODBYE (-200) diff --git a/slsDetectorServers/slsDetectorServer/src/AD9257.c b/slsDetectorServers/slsDetectorServer/src/AD9257.c index bbe3bea1d..68cc42cee 100644 --- a/slsDetectorServers/slsDetectorServer/src/AD9257.c +++ b/slsDetectorServers/slsDetectorServer/src/AD9257.c @@ -2,7 +2,7 @@ #include "blackfin.h" #include "clogger.h" #include "commonServerFunctions.h" // blackfin.h, ansi.h -#include "sls_detector_defs.h" +#include "sls/sls_detector_defs.h" /* AD9257 ADC DEFINES */ #define AD9257_ADC_NUMBITS (24) diff --git a/slsDetectorServers/slsDetectorServer/src/ALTERA_PLL_CYCLONE10.c b/slsDetectorServers/slsDetectorServer/src/ALTERA_PLL_CYCLONE10.c index 13ddf9fa3..be52b46b8 100644 --- a/slsDetectorServers/slsDetectorServer/src/ALTERA_PLL_CYCLONE10.c +++ b/slsDetectorServers/slsDetectorServer/src/ALTERA_PLL_CYCLONE10.c @@ -1,7 +1,7 @@ #include "ALTERA_PLL_CYCLONE10.h" #include "clogger.h" #include "nios.h" -#include "sls_detector_defs.h" +#include "sls/sls_detector_defs.h" #include // usleep diff --git a/slsDetectorServers/slsDetectorServer/src/ASIC_Driver.c b/slsDetectorServers/slsDetectorServer/src/ASIC_Driver.c index d9a7330f4..e084557f9 100644 --- a/slsDetectorServers/slsDetectorServer/src/ASIC_Driver.c +++ b/slsDetectorServers/slsDetectorServer/src/ASIC_Driver.c @@ -1,7 +1,7 @@ #include "ASIC_Driver.h" #include "clogger.h" #include "common.h" -#include "sls_detector_defs.h" +#include "sls/sls_detector_defs.h" #include #include diff --git a/slsDetectorServers/slsDetectorServer/src/DAC6571.c b/slsDetectorServers/slsDetectorServer/src/DAC6571.c index 8bd7de559..26b3cac68 100644 --- a/slsDetectorServers/slsDetectorServer/src/DAC6571.c +++ b/slsDetectorServers/slsDetectorServer/src/DAC6571.c @@ -1,7 +1,7 @@ #include "DAC6571.h" #include "clogger.h" #include "common.h" -#include "sls_detector_defs.h" +#include "sls/sls_detector_defs.h" #include "string.h" diff --git a/slsDetectorServers/slsDetectorServer/src/LTC2620.c b/slsDetectorServers/slsDetectorServer/src/LTC2620.c index aa4e93554..d3c80f03a 100644 --- a/slsDetectorServers/slsDetectorServer/src/LTC2620.c +++ b/slsDetectorServers/slsDetectorServer/src/LTC2620.c @@ -3,7 +3,7 @@ #include "clogger.h" #include "common.h" #include "commonServerFunctions.h" // blackfin.h, ansi.h -#include "sls_detector_defs.h" +#include "sls/sls_detector_defs.h" #include diff --git a/slsDetectorServers/slsDetectorServer/src/LTC2620_Driver.c b/slsDetectorServers/slsDetectorServer/src/LTC2620_Driver.c index aeb7615ca..be331225b 100644 --- a/slsDetectorServers/slsDetectorServer/src/LTC2620_Driver.c +++ b/slsDetectorServers/slsDetectorServer/src/LTC2620_Driver.c @@ -1,7 +1,7 @@ #include "LTC2620_Driver.h" #include "clogger.h" #include "common.h" -#include "sls_detector_defs.h" +#include "sls/sls_detector_defs.h" #include diff --git a/slsDetectorServers/slsDetectorServer/src/MAX1932.c b/slsDetectorServers/slsDetectorServer/src/MAX1932.c index 0128cc01c..833d18d50 100644 --- a/slsDetectorServers/slsDetectorServer/src/MAX1932.c +++ b/slsDetectorServers/slsDetectorServer/src/MAX1932.c @@ -3,7 +3,7 @@ #include "clogger.h" #include "common.h" #include "commonServerFunctions.h" // blackfin.h, ansi.h -#include "sls_detector_defs.h" +#include "sls/sls_detector_defs.h" /* MAX1932 HV DEFINES */ diff --git a/slsDetectorServers/slsDetectorServer/src/UDPPacketHeaderGenerator.c b/slsDetectorServers/slsDetectorServer/src/UDPPacketHeaderGenerator.c index 1c66439c0..89d760db2 100644 --- a/slsDetectorServers/slsDetectorServer/src/UDPPacketHeaderGenerator.c +++ b/slsDetectorServers/slsDetectorServer/src/UDPPacketHeaderGenerator.c @@ -1,6 +1,6 @@ #include "UDPPacketHeaderGenerator.h" #include "clogger.h" -#include "sls_detector_defs.h" +#include "sls/sls_detector_defs.h" #include #include diff --git a/slsDetectorServers/slsDetectorServer/src/blackfin.c b/slsDetectorServers/slsDetectorServer/src/blackfin.c index c3989821e..926b480f1 100644 --- a/slsDetectorServers/slsDetectorServer/src/blackfin.c +++ b/slsDetectorServers/slsDetectorServer/src/blackfin.c @@ -1,8 +1,8 @@ #include "blackfin.h" #include "RegisterDefs.h" -#include "ansi.h" +#include "sls/ansi.h" #include "clogger.h" -#include "sls_detector_defs.h" +#include "sls/sls_detector_defs.h" #include // open #include // mmap diff --git a/slsDetectorServers/slsDetectorServer/src/common.c b/slsDetectorServers/slsDetectorServer/src/common.c index 5d2cb5c1a..8ab9dffe1 100644 --- a/slsDetectorServers/slsDetectorServer/src/common.c +++ b/slsDetectorServers/slsDetectorServer/src/common.c @@ -1,7 +1,7 @@ #define _GNU_SOURCE // needed for strptime to be at the top #include "common.h" #include "clogger.h" -#include "sls_detector_defs.h" +#include "sls/sls_detector_defs.h" #include // dirname #include diff --git a/slsDetectorServers/slsDetectorServer/src/communication_funcs_UDP.c b/slsDetectorServers/slsDetectorServer/src/communication_funcs_UDP.c index 28a2e2a71..f001f3629 100644 --- a/slsDetectorServers/slsDetectorServer/src/communication_funcs_UDP.c +++ b/slsDetectorServers/slsDetectorServer/src/communication_funcs_UDP.c @@ -1,6 +1,6 @@ #include "communication_funcs_UDP.h" #include "clogger.h" -#include "sls_detector_defs.h" +#include "sls/sls_detector_defs.h" #include #include diff --git a/slsDetectorServers/slsDetectorServer/src/nios.c b/slsDetectorServers/slsDetectorServer/src/nios.c index 82fbbcc07..af4a8f477 100644 --- a/slsDetectorServers/slsDetectorServer/src/nios.c +++ b/slsDetectorServers/slsDetectorServer/src/nios.c @@ -1,9 +1,9 @@ #include "nios.h" #include "RegisterDefs.h" -#include "ansi.h" +#include "sls/ansi.h" #include "clogger.h" #include "common.h" -#include "sls_detector_defs.h" +#include "sls/sls_detector_defs.h" #include // open #include diff --git a/slsDetectorServers/slsDetectorServer/src/programFpgaBlackfin.c b/slsDetectorServers/slsDetectorServer/src/programFpgaBlackfin.c index 5ca2e9ca7..645d42886 100644 --- a/slsDetectorServers/slsDetectorServer/src/programFpgaBlackfin.c +++ b/slsDetectorServers/slsDetectorServer/src/programFpgaBlackfin.c @@ -1,5 +1,5 @@ #include "programFpgaBlackfin.h" -#include "ansi.h" +#include "sls/ansi.h" #include "clogger.h" #include "slsDetectorServer_defs.h" diff --git a/slsDetectorServers/slsDetectorServer/src/programFpgaNios.c b/slsDetectorServers/slsDetectorServer/src/programFpgaNios.c index a00fb3468..134fb5a91 100644 --- a/slsDetectorServers/slsDetectorServer/src/programFpgaNios.c +++ b/slsDetectorServers/slsDetectorServer/src/programFpgaNios.c @@ -1,5 +1,5 @@ #include "programFpgaNios.h" -#include "ansi.h" +#include "sls/ansi.h" #include "clogger.h" #include "slsDetectorServer_defs.h" diff --git a/slsDetectorServers/slsDetectorServer/src/readDefaultPattern.c b/slsDetectorServers/slsDetectorServer/src/readDefaultPattern.c index 538ea24fb..e60370306 100644 --- a/slsDetectorServers/slsDetectorServer/src/readDefaultPattern.c +++ b/slsDetectorServers/slsDetectorServer/src/readDefaultPattern.c @@ -1,9 +1,9 @@ #include "readDefaultPattern.h" -#include "ansi.h" +#include "sls/ansi.h" #include "clogger.h" #include "common.h" #include "slsDetectorServer_defs.h" -#include "sls_detector_defs.h" +#include "sls/sls_detector_defs.h" #include diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer.c index 0d1d65ba3..98e327709 100644 --- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer.c +++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer.c @@ -6,8 +6,8 @@ #include "sharedMemory.h" #include "slsDetectorServer_defs.h" #include "slsDetectorServer_funcs.h" -#include "sls_detector_defs.h" -#include "versionAPI.h" +#include "sls/sls_detector_defs.h" +#include "sls/versionAPI.h" #include #include diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c index 3a39ad220..7c9d7c7f4 100644 --- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c +++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c @@ -3,7 +3,7 @@ #include "communication_funcs.h" #include "sharedMemory.h" #include "slsDetectorFunctionList.h" -#include "sls_detector_funcs.h" +#include "sls/sls_detector_funcs.h" #include #include diff --git a/slsDetectorSoftware/CMakeLists.txt b/slsDetectorSoftware/CMakeLists.txt index 349f5d9d6..571b6dcfb 100755 --- 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 ) diff --git a/slsDetectorSoftware/include/Detector.h b/slsDetectorSoftware/include/sls/Detector.h similarity index 99% rename from slsDetectorSoftware/include/Detector.h rename to slsDetectorSoftware/include/sls/Detector.h index 0947733d2..5c9c094ba 100644 --- a/slsDetectorSoftware/include/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 #include #include diff --git a/slsDetectorSoftware/include/Result.h b/slsDetectorSoftware/include/sls/Result.h similarity index 98% rename from slsDetectorSoftware/include/Result.h rename to slsDetectorSoftware/include/sls/Result.h index cb5724334..c7f71e481 100644 --- a/slsDetectorSoftware/include/Result.h +++ b/slsDetectorSoftware/include/sls/Result.h @@ -13,8 +13,8 @@ #include #include -#include "ToString.h" -#include "container_utils.h" +#include "sls/ToString.h" +#include "sls/container_utils.h" namespace sls { diff --git a/slsDetectorSoftware/include/detectorData.h b/slsDetectorSoftware/include/sls/detectorData.h similarity index 100% rename from slsDetectorSoftware/include/detectorData.h rename to slsDetectorSoftware/include/sls/detectorData.h diff --git a/slsDetectorSoftware/src/CmdLineApp.cpp b/slsDetectorSoftware/src/CmdLineApp.cpp index 39f1fd349..ad289097b 100644 --- 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 //strcmp #include int main(int argc, char *argv[]) { diff --git a/slsDetectorSoftware/src/CmdParser.cpp b/slsDetectorSoftware/src/CmdParser.cpp index ef4c2780a..6d08e26ae 100644 --- 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 #include #include diff --git a/slsDetectorSoftware/src/CmdProxy.cpp b/slsDetectorSoftware/src/CmdProxy.cpp index e33872787..a82d63845 100644 --- 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 #include diff --git a/slsDetectorSoftware/src/CmdProxy.h b/slsDetectorSoftware/src/CmdProxy.h index f67bd4a45..9a8dd4b97 100644 --- 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 #include #include diff --git a/slsDetectorSoftware/src/Detector.cpp b/slsDetectorSoftware/src/Detector.cpp index 2186531b2..ac30dd52f 100644 --- 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 #include diff --git a/slsDetectorSoftware/src/DetectorImpl.cpp b/slsDetectorSoftware/src/DetectorImpl.cpp index 0894806a2..f9c4b33e2 100644 --- 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 #include diff --git a/slsDetectorSoftware/src/DetectorImpl.h b/slsDetectorSoftware/src/DetectorImpl.h index 1e4ae1865..e88876919 100644 --- 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; diff --git a/slsDetectorSoftware/src/HelpDacs.h b/slsDetectorSoftware/src/HelpDacs.h index 75d108c61..71f2f9c4d 100644 --- 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)) { diff --git a/slsDetectorSoftware/src/Module.cpp b/slsDetectorSoftware/src/Module.cpp index a856fe145..e4dd74d7a 100644 --- 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 #include diff --git a/slsDetectorSoftware/src/Module.h b/slsDetectorSoftware/src/Module.h index f9f808750..a7ec84fa8 100644 --- 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 #include diff --git a/slsDetectorSoftware/src/SharedMemory.h b/slsDetectorSoftware/src/SharedMemory.h index 806435e1b..eadd45c5c 100644 --- 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 // errno diff --git a/slsDetectorSoftware/tests/test-CmdProxy-chiptestboard.cpp b/slsDetectorSoftware/tests/test-CmdProxy-chiptestboard.cpp index 44e76b1e2..3771ddcf7 100644 --- 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 -#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; diff --git a/slsDetectorSoftware/tests/test-CmdProxy-eiger.cpp b/slsDetectorSoftware/tests/test-CmdProxy-eiger.cpp index 912d83836..f21decd0b 100644 --- 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 #include #include #include "test-CmdProxy-global.h" #include "tests/globals.h" -#include "versionAPI.h" +#include "sls/versionAPI.h" using sls::CmdProxy; using sls::Detector; diff --git a/slsDetectorSoftware/tests/test-CmdProxy-global.cpp b/slsDetectorSoftware/tests/test-CmdProxy-global.cpp index d327ec24c..1690fcb6c 100644 --- 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" diff --git a/slsDetectorSoftware/tests/test-CmdProxy-global.h b/slsDetectorSoftware/tests/test-CmdProxy-global.h index 2a2eb7722..0a1777b7a 100644 --- 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); diff --git a/slsDetectorSoftware/tests/test-CmdProxy-gotthard.cpp b/slsDetectorSoftware/tests/test-CmdProxy-gotthard.cpp index 58d859aa7..f26cbc7a4 100644 --- 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 -#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; diff --git a/slsDetectorSoftware/tests/test-CmdProxy-gotthard2.cpp b/slsDetectorSoftware/tests/test-CmdProxy-gotthard2.cpp index 78825a812..9311a626a 100644 --- 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 -#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; diff --git a/slsDetectorSoftware/tests/test-CmdProxy-jungfrau.cpp b/slsDetectorSoftware/tests/test-CmdProxy-jungfrau.cpp index 3d6482cf6..a86f5f233 100644 --- 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 #include "test-CmdProxy-global.h" #include "tests/globals.h" -#include "versionAPI.h" +#include "sls/versionAPI.h" using sls::CmdProxy; using sls::Detector; diff --git a/slsDetectorSoftware/tests/test-CmdProxy-moench.cpp b/slsDetectorSoftware/tests/test-CmdProxy-moench.cpp index e8090f40b..8ea7b397e 100644 --- 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 -#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; diff --git a/slsDetectorSoftware/tests/test-CmdProxy-mythen3.cpp b/slsDetectorSoftware/tests/test-CmdProxy-mythen3.cpp index e63417664..a9f848088 100644 --- 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 -#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; diff --git a/slsDetectorSoftware/tests/test-CmdProxy-pattern.cpp b/slsDetectorSoftware/tests/test-CmdProxy-pattern.cpp index 4a0f5c8c7..7fd970f8e 100644 --- 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 -#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; diff --git a/slsDetectorSoftware/tests/test-CmdProxy-rx.cpp b/slsDetectorSoftware/tests/test-CmdProxy-rx.cpp index e53f39568..337a752c9 100644 --- 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 #include "tests/globals.h" -#include "versionAPI.h" +#include "sls/versionAPI.h" using sls::CmdProxy; using sls::Detector; diff --git a/slsDetectorSoftware/tests/test-CmdProxy.cpp b/slsDetectorSoftware/tests/test-CmdProxy.cpp index 5538fff9f..c4c2fda87 100644 --- 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 #include diff --git a/slsDetectorSoftware/tests/test-Result.cpp b/slsDetectorSoftware/tests/test-Result.cpp index 618411caf..8e659a559 100644 --- 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 diff --git a/slsDetectorSoftware/tests/test-SharedMemory.cpp b/slsDetectorSoftware/tests/test-SharedMemory.cpp index a46b7071a..2d5c99785 100644 --- 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 diff --git a/slsDetectorSoftware/tests/test-slsDetector.cpp b/slsDetectorSoftware/tests/test-slsDetector.cpp index 5a6f9bcc1..cd939fb0b 100644 --- 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 // #include diff --git a/slsReceiverSoftware/CMakeLists.txt b/slsReceiverSoftware/CMakeLists.txt index 577e08dc7..843bd6241 100755 --- a/slsReceiverSoftware/CMakeLists.txt +++ b/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) diff --git a/slsReceiverSoftware/include/CircularFifo.h b/slsReceiverSoftware/include/sls/CircularFifo.h similarity index 100% rename from slsReceiverSoftware/include/CircularFifo.h rename to slsReceiverSoftware/include/sls/CircularFifo.h diff --git a/slsReceiverSoftware/include/Receiver.h b/slsReceiverSoftware/include/sls/Receiver.h similarity index 98% rename from slsReceiverSoftware/include/Receiver.h rename to slsReceiverSoftware/include/sls/Receiver.h index 5958af319..f9234dd33 100644 --- a/slsReceiverSoftware/include/Receiver.h +++ b/slsReceiverSoftware/include/sls/Receiver.h @@ -1,5 +1,5 @@ #pragma once -#include "sls_detector_defs.h" +#include "sls/sls_detector_defs.h" #include class ClientInterface; diff --git a/slsReceiverSoftware/src/ClientInterface.cpp b/slsReceiverSoftware/src/ClientInterface.cpp index 71b5ab4d0..5dfe2f208 100644 --- a/slsReceiverSoftware/src/ClientInterface.cpp +++ b/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 #include diff --git a/slsReceiverSoftware/src/ClientInterface.h b/slsReceiverSoftware/src/ClientInterface.h index 391ff0a16..bc6e7a420 100644 --- a/slsReceiverSoftware/src/ClientInterface.h +++ b/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 diff --git a/slsReceiverSoftware/src/DataProcessor.cpp b/slsReceiverSoftware/src/DataProcessor.cpp index 1e7f3c0fd..db0992dfb 100644 --- a/slsReceiverSoftware/src/DataProcessor.cpp +++ b/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 #include diff --git a/slsReceiverSoftware/src/DataStreamer.cpp b/slsReceiverSoftware/src/DataStreamer.cpp index 2549cabfc..7192e4918 100644 --- a/slsReceiverSoftware/src/DataStreamer.cpp +++ b/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 #include diff --git a/slsReceiverSoftware/src/DataStreamer.h b/slsReceiverSoftware/src/DataStreamer.h index f04bfc4ac..4fcf543ca 100644 --- a/slsReceiverSoftware/src/DataStreamer.h +++ b/slsReceiverSoftware/src/DataStreamer.h @@ -8,7 +8,7 @@ */ #include "ThreadObject.h" -#include "network_utils.h" +#include "sls/network_utils.h" class GeneralData; class Fifo; diff --git a/slsReceiverSoftware/src/Fifo.cpp b/slsReceiverSoftware/src/Fifo.cpp index 5c1fd35c1..a94ad4e77 100644 --- a/slsReceiverSoftware/src/Fifo.cpp +++ b/slsReceiverSoftware/src/Fifo.cpp @@ -6,7 +6,7 @@ ***********************************************/ #include "Fifo.h" -#include "sls_detector_exceptions.h" +#include "sls/sls_detector_exceptions.h" #include #include diff --git a/slsReceiverSoftware/src/Fifo.h b/slsReceiverSoftware/src/Fifo.h index 7e0fcf1db..cd71d0fd3 100644 --- a/slsReceiverSoftware/src/Fifo.h +++ b/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 { diff --git a/slsReceiverSoftware/src/File.h b/slsReceiverSoftware/src/File.h index 20a6c4562..d37550984 100644 --- a/slsReceiverSoftware/src/File.h +++ b/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 diff --git a/slsReceiverSoftware/src/GeneralData.h b/slsReceiverSoftware/src/GeneralData.h index 0174811c7..4c08fa54f 100644 --- a/slsReceiverSoftware/src/GeneralData.h +++ b/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 //ceil #include diff --git a/slsReceiverSoftware/src/Implementation.cpp b/slsReceiverSoftware/src/Implementation.cpp index c16af4e7a..711576688 100644 --- a/slsReceiverSoftware/src/Implementation.cpp +++ b/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 //eperm #include diff --git a/slsReceiverSoftware/src/Implementation.h b/slsReceiverSoftware/src/Implementation.h index 4dd47c98d..ab2899992 100644 --- a/slsReceiverSoftware/src/Implementation.h +++ b/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; diff --git a/slsReceiverSoftware/src/Listener.cpp b/slsReceiverSoftware/src/Listener.cpp index 82d38a85f..f1b1bcee1 100644 --- a/slsReceiverSoftware/src/Listener.cpp +++ b/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 #include diff --git a/slsReceiverSoftware/src/Listener.h b/slsReceiverSoftware/src/Listener.h index f1dbbbe69..5f6bdc46e 100644 --- a/slsReceiverSoftware/src/Listener.h +++ b/slsReceiverSoftware/src/Listener.h @@ -10,7 +10,7 @@ */ #include "ThreadObject.h" -#include "UdpRxSocket.h" +#include "sls/UdpRxSocket.h" #include #include diff --git a/slsReceiverSoftware/src/MasterAttributes.h b/slsReceiverSoftware/src/MasterAttributes.h index 2718de1bc..df193627f 100644 --- a/slsReceiverSoftware/src/MasterAttributes.h +++ b/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" diff --git a/slsReceiverSoftware/src/MultiReceiverApp.cpp b/slsReceiverSoftware/src/MultiReceiverApp.cpp index fd52200c4..2b1caecf8 100644 --- a/slsReceiverSoftware/src/MultiReceiverApp.cpp +++ b/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 //SIGINT #include diff --git a/slsReceiverSoftware/src/Receiver.cpp b/slsReceiverSoftware/src/Receiver.cpp index 872daeea0..a7c2a0472 100644 --- a/slsReceiverSoftware/src/Receiver.cpp +++ b/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 #include diff --git a/slsReceiverSoftware/src/ReceiverApp.cpp b/slsReceiverSoftware/src/ReceiverApp.cpp index 764de247f..6689a7770 100644 --- a/slsReceiverSoftware/src/ReceiverApp.cpp +++ b/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 //SIGINT #include diff --git a/slsReceiverSoftware/src/ThreadObject.cpp b/slsReceiverSoftware/src/ThreadObject.cpp index 0f8f9b9e3..18477e912 100644 --- a/slsReceiverSoftware/src/ThreadObject.cpp +++ b/slsReceiverSoftware/src/ThreadObject.cpp @@ -4,7 +4,7 @@ ***********************************************/ #include "ThreadObject.h" -#include "container_utils.h" +#include "sls/container_utils.h" #include #include #include diff --git a/slsReceiverSoftware/src/ThreadObject.h b/slsReceiverSoftware/src/ThreadObject.h index 4216c4360..f057c5553 100644 --- a/slsReceiverSoftware/src/ThreadObject.h +++ b/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 #include diff --git a/slsReceiverSoftware/src/receiver_defs.h b/slsReceiverSoftware/src/receiver_defs.h index a8d5b0beb..26fd25160 100755 --- a/slsReceiverSoftware/src/receiver_defs.h +++ b/slsReceiverSoftware/src/receiver_defs.h @@ -1,6 +1,6 @@ #pragma once -#include "sls_detector_defs.h" +#include "sls/sls_detector_defs.h" #include #define MAX_DIMENSIONS (2) diff --git a/slsReceiverSoftware/tests/test-CircularFifo.cpp b/slsReceiverSoftware/tests/test-CircularFifo.cpp index 88987a2fb..66ea86480 100644 --- a/slsReceiverSoftware/tests/test-CircularFifo.cpp +++ b/slsReceiverSoftware/tests/test-CircularFifo.cpp @@ -1,4 +1,4 @@ -#include "CircularFifo.h" +#include "sls/CircularFifo.h" #include "catch.hpp" #include diff --git a/slsSupportLib/CMakeLists.txt b/slsSupportLib/CMakeLists.txt index 787942ea6..db4157b92 100755 --- a/slsSupportLib/CMakeLists.txt +++ b/slsSupportLib/CMakeLists.txt @@ -14,14 +14,14 @@ set(SOURCES # Header files to install as a part of the library set(PUBLICHEADERS - include/sls_detector_defs.h - include/sls_detector_exceptions.h - include/container_utils.h - include/string_utils.h - include/network_utils.h - include/ToString.h - include/TypeTraits.h - include/TimeHelper.h + include/sls/sls_detector_defs.h + include/sls/sls_detector_exceptions.h + include/sls/container_utils.h + include/sls/string_utils.h + include/sls/network_utils.h + include/sls/ToString.h + include/sls/TypeTraits.h + include/sls/TimeHelper.h ) # Additional headers to be installed if SLS_DEVEL_HEADERS @@ -31,18 +31,18 @@ set(PUBLICHEADERS if(SLS_DEVEL_HEADERS) set(PUBLICHEADERS ${PUBLICHEADERS} - include/file_utils.h - include/sls_detector_funcs.h - include/ClientSocket.h - include/DataSocket.h - include/ServerSocket.h - include/ServerInterface.h - include/Timer.h - include/StaticVector.h - include/UdpRxSocket.h - include/versionAPI.h - include/ZmqSocket.h - include/bit_utils.h + include/sls/file_utils.h + include/sls/sls_detector_funcs.h + include/sls/ClientSocket.h + include/sls/DataSocket.h + include/sls/ServerSocket.h + include/sls/ServerInterface.h + include/sls/Timer.h + include/sls/StaticVector.h + include/sls/UdpRxSocket.h + include/sls/versionAPI.h + include/sls/ZmqSocket.h + include/sls/bit_utils.h ) endif() @@ -106,6 +106,6 @@ install(TARGETS slsSupportShared slsSupportStatic slsSupportObject EXPORT "${TARGETS_EXPORT_NAME}" LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sls ) diff --git a/slsSupportLib/include/ClientSocket.h b/slsSupportLib/include/sls/ClientSocket.h similarity index 98% rename from slsSupportLib/include/ClientSocket.h rename to slsSupportLib/include/sls/ClientSocket.h index d342097cb..3a6db7957 100644 --- a/slsSupportLib/include/ClientSocket.h +++ b/slsSupportLib/include/sls/ClientSocket.h @@ -1,5 +1,5 @@ #pragma once -#include "DataSocket.h" +#include "sls/DataSocket.h" #include #include #include diff --git a/slsSupportLib/include/DataSocket.h b/slsSupportLib/include/sls/DataSocket.h similarity index 98% rename from slsSupportLib/include/DataSocket.h rename to slsSupportLib/include/sls/DataSocket.h index 2d7acbb47..3bfce8779 100644 --- a/slsSupportLib/include/DataSocket.h +++ b/slsSupportLib/include/sls/DataSocket.h @@ -1,6 +1,6 @@ #pragma once -#include "TypeTraits.h" +#include "sls/TypeTraits.h" #include #include #include diff --git a/slsSupportLib/include/ServerInterface.h b/slsSupportLib/include/sls/ServerInterface.h similarity index 86% rename from slsSupportLib/include/ServerInterface.h rename to slsSupportLib/include/sls/ServerInterface.h index 8f6d819fa..864cd56c1 100644 --- a/slsSupportLib/include/ServerInterface.h +++ b/slsSupportLib/include/sls/ServerInterface.h @@ -1,12 +1,12 @@ #pragma once -#include "DataSocket.h" +#include "sls/DataSocket.h" namespace sls { class ServerInterface; } -#include "ServerSocket.h" -#include "sls_detector_defs.h" +#include "sls/ServerSocket.h" +#include "sls/sls_detector_defs.h" namespace sls { class ServerInterface : public DataSocket { diff --git a/slsSupportLib/include/ServerSocket.h b/slsSupportLib/include/sls/ServerSocket.h similarity index 89% rename from slsSupportLib/include/ServerSocket.h rename to slsSupportLib/include/sls/ServerSocket.h index 422f9120c..57418a586 100644 --- a/slsSupportLib/include/ServerSocket.h +++ b/slsSupportLib/include/sls/ServerSocket.h @@ -1,8 +1,8 @@ #pragma once -#include "DataSocket.h" -#include "ServerInterface.h" -#include "network_utils.h" +#include "sls/DataSocket.h" +#include "sls/ServerInterface.h" +#include "sls/network_utils.h" #include #include #include diff --git a/slsSupportLib/include/StaticVector.h b/slsSupportLib/include/sls/StaticVector.h similarity index 99% rename from slsSupportLib/include/StaticVector.h rename to slsSupportLib/include/sls/StaticVector.h index f181e0c72..a9cd0f3ca 100644 --- a/slsSupportLib/include/StaticVector.h +++ b/slsSupportLib/include/sls/StaticVector.h @@ -1,6 +1,6 @@ #pragma once -#include "ToString.h" -#include "TypeTraits.h" +#include "sls/ToString.h" +#include "sls/TypeTraits.h" #include #include #include diff --git a/slsSupportLib/include/TimeHelper.h b/slsSupportLib/include/sls/TimeHelper.h similarity index 94% rename from slsSupportLib/include/TimeHelper.h rename to slsSupportLib/include/sls/TimeHelper.h index 99730b50e..820e91508 100644 --- a/slsSupportLib/include/TimeHelper.h +++ b/slsSupportLib/include/sls/TimeHelper.h @@ -1,7 +1,7 @@ #pragma once #include -#include "TypeTraits.h" +#include "sls/TypeTraits.h" namespace sls { namespace time { using ns = std::chrono::nanoseconds; diff --git a/slsSupportLib/include/Timer.h b/slsSupportLib/include/sls/Timer.h similarity index 100% rename from slsSupportLib/include/Timer.h rename to slsSupportLib/include/sls/Timer.h diff --git a/slsSupportLib/include/ToString.h b/slsSupportLib/include/sls/ToString.h similarity index 98% rename from slsSupportLib/include/ToString.h rename to slsSupportLib/include/sls/ToString.h index e3a179389..bccf85e2e 100644 --- a/slsSupportLib/include/ToString.h +++ b/slsSupportLib/include/sls/ToString.h @@ -7,11 +7,11 @@ * */ -#include "TimeHelper.h" -#include "TypeTraits.h" -#include "sls_detector_defs.h" -#include "sls_detector_exceptions.h" -#include "string_utils.h" +#include "sls/TimeHelper.h" +#include "sls/TypeTraits.h" +#include "sls/sls_detector_defs.h" +#include "sls/sls_detector_exceptions.h" +#include "sls/string_utils.h" #include #include #include diff --git a/slsSupportLib/include/TypeTraits.h b/slsSupportLib/include/sls/TypeTraits.h similarity index 100% rename from slsSupportLib/include/TypeTraits.h rename to slsSupportLib/include/sls/TypeTraits.h diff --git a/slsSupportLib/include/UdpRxSocket.h b/slsSupportLib/include/sls/UdpRxSocket.h similarity index 100% rename from slsSupportLib/include/UdpRxSocket.h rename to slsSupportLib/include/sls/UdpRxSocket.h diff --git a/slsSupportLib/include/ZmqSocket.h b/slsSupportLib/include/sls/ZmqSocket.h similarity index 98% rename from slsSupportLib/include/ZmqSocket.h rename to slsSupportLib/include/sls/ZmqSocket.h index ab9000bb4..713f59a73 100644 --- a/slsSupportLib/include/ZmqSocket.h +++ b/slsSupportLib/include/sls/ZmqSocket.h @@ -7,7 +7,7 @@ *@short functions to open/close zmq sockets */ -#include "sls_detector_exceptions.h" +#include "sls/sls_detector_exceptions.h" #include //json header in zmq stream #define MAX_STR_LENGTH 1000 @@ -16,7 +16,7 @@ #define ROIVERBOSITY class zmq_msg_t; -#include "container_utils.h" +#include "sls/container_utils.h" #include #include /** zmq header structure */ diff --git a/slsSupportLib/include/ansi.h b/slsSupportLib/include/sls/ansi.h similarity index 100% rename from slsSupportLib/include/ansi.h rename to slsSupportLib/include/sls/ansi.h diff --git a/slsSupportLib/include/bit_utils.h b/slsSupportLib/include/sls/bit_utils.h similarity index 100% rename from slsSupportLib/include/bit_utils.h rename to slsSupportLib/include/sls/bit_utils.h diff --git a/slsSupportLib/include/container_utils.h b/slsSupportLib/include/sls/container_utils.h similarity index 99% rename from slsSupportLib/include/container_utils.h rename to slsSupportLib/include/sls/container_utils.h index d13719a57..8e7829e48 100644 --- a/slsSupportLib/include/container_utils.h +++ b/slsSupportLib/include/sls/container_utils.h @@ -9,7 +9,7 @@ #include #include -#include "TypeTraits.h" +#include "sls/TypeTraits.h" namespace sls { diff --git a/slsSupportLib/include/file_utils.h b/slsSupportLib/include/sls/file_utils.h similarity index 97% rename from slsSupportLib/include/file_utils.h rename to slsSupportLib/include/sls/file_utils.h index 7a46850d3..1b01b2398 100644 --- a/slsSupportLib/include/file_utils.h +++ b/slsSupportLib/include/sls/file_utils.h @@ -1,6 +1,6 @@ #pragma once -#include "sls_detector_defs.h" +#include "sls/sls_detector_defs.h" #include #include diff --git a/slsSupportLib/include/logger.h b/slsSupportLib/include/sls/logger.h similarity index 99% rename from slsSupportLib/include/logger.h rename to slsSupportLib/include/sls/logger.h index 7d16a2f5d..d3b783295 100644 --- a/slsSupportLib/include/logger.h +++ b/slsSupportLib/include/sls/logger.h @@ -1,7 +1,7 @@ #pragma once /*Utility to log to console*/ -#include "ansi.h" //Colors +#include "sls/ansi.h" //Colors #include #include #include diff --git a/slsSupportLib/include/network_utils.h b/slsSupportLib/include/sls/network_utils.h similarity index 100% rename from slsSupportLib/include/network_utils.h rename to slsSupportLib/include/sls/network_utils.h diff --git a/slsSupportLib/include/sls_detector_defs.h b/slsSupportLib/include/sls/sls_detector_defs.h similarity index 99% rename from slsSupportLib/include/sls_detector_defs.h rename to slsSupportLib/include/sls/sls_detector_defs.h index ca1537d0b..897f18a9b 100644 --- a/slsSupportLib/include/sls_detector_defs.h +++ b/slsSupportLib/include/sls/sls_detector_defs.h @@ -16,7 +16,7 @@ #ifdef __cplusplus // C++ includes -#include "sls_detector_exceptions.h" +#include "sls/sls_detector_exceptions.h" #include #include #include @@ -491,7 +491,7 @@ typedef struct { #endif // #ifndef MYROOT - // #include "sls_detector_funcs.h" + // #include "sls/sls_detector_funcs.h" // #endif #ifdef __cplusplus diff --git a/slsSupportLib/include/sls_detector_exceptions.h b/slsSupportLib/include/sls/sls_detector_exceptions.h similarity index 100% rename from slsSupportLib/include/sls_detector_exceptions.h rename to slsSupportLib/include/sls/sls_detector_exceptions.h diff --git a/slsSupportLib/include/sls_detector_funcs.h b/slsSupportLib/include/sls/sls_detector_funcs.h similarity index 100% rename from slsSupportLib/include/sls_detector_funcs.h rename to slsSupportLib/include/sls/sls_detector_funcs.h diff --git a/slsSupportLib/include/string_utils.h b/slsSupportLib/include/sls/string_utils.h similarity index 100% rename from slsSupportLib/include/string_utils.h rename to slsSupportLib/include/sls/string_utils.h diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h similarity index 100% rename from slsSupportLib/include/versionAPI.h rename to slsSupportLib/include/sls/versionAPI.h diff --git a/slsSupportLib/src/ClientSocket.cpp b/slsSupportLib/src/ClientSocket.cpp index de0e4c16e..055273d4c 100644 --- a/slsSupportLib/src/ClientSocket.cpp +++ b/slsSupportLib/src/ClientSocket.cpp @@ -1,7 +1,7 @@ -#include "ClientSocket.h" -#include "logger.h" -#include "sls_detector_defs.h" -#include "sls_detector_exceptions.h" +#include "sls/ClientSocket.h" +#include "sls/logger.h" +#include "sls/sls_detector_defs.h" +#include "sls/sls_detector_exceptions.h" #include #include #include diff --git a/slsSupportLib/src/DataSocket.cpp b/slsSupportLib/src/DataSocket.cpp index 28aad7c94..1f5241422 100644 --- a/slsSupportLib/src/DataSocket.cpp +++ b/slsSupportLib/src/DataSocket.cpp @@ -1,6 +1,6 @@ -#include "DataSocket.h" -#include "logger.h" -#include "sls_detector_exceptions.h" +#include "sls/DataSocket.h" +#include "sls/logger.h" +#include "sls/sls_detector_exceptions.h" #include #include #include diff --git a/slsSupportLib/src/ServerInterface.cpp b/slsSupportLib/src/ServerInterface.cpp index 9ea66e473..7e912ab09 100644 --- a/slsSupportLib/src/ServerInterface.cpp +++ b/slsSupportLib/src/ServerInterface.cpp @@ -1,5 +1,5 @@ -#include "ServerInterface.h" -#include "logger.h" +#include "sls/ServerInterface.h" +#include "sls/logger.h" #include #include #include diff --git a/slsSupportLib/src/ServerSocket.cpp b/slsSupportLib/src/ServerSocket.cpp index 06c95096a..a9fafa1da 100644 --- a/slsSupportLib/src/ServerSocket.cpp +++ b/slsSupportLib/src/ServerSocket.cpp @@ -1,11 +1,11 @@ -#include "ServerSocket.h" -#include "ServerInterface.h" +#include "sls/ServerSocket.h" +#include "sls/ServerInterface.h" -#include "DataSocket.h" -#include "logger.h" -#include "sls_detector_defs.h" -#include "sls_detector_exceptions.h" -#include "string_utils.h" +#include "sls/DataSocket.h" +#include "sls/logger.h" +#include "sls/sls_detector_defs.h" +#include "sls/sls_detector_exceptions.h" +#include "sls/string_utils.h" #include #include diff --git a/slsSupportLib/src/ToString.cpp b/slsSupportLib/src/ToString.cpp index 4938e2852..9b9944e28 100644 --- a/slsSupportLib/src/ToString.cpp +++ b/slsSupportLib/src/ToString.cpp @@ -1,5 +1,5 @@ -#include "ToString.h" -#include "network_utils.h" +#include "sls/ToString.h" +#include "sls/network_utils.h" namespace sls { diff --git a/slsSupportLib/src/UdpRxSocket.cpp b/slsSupportLib/src/UdpRxSocket.cpp index aadb3efac..0d9d3c694 100644 --- a/slsSupportLib/src/UdpRxSocket.cpp +++ b/slsSupportLib/src/UdpRxSocket.cpp @@ -1,7 +1,7 @@ -#include "UdpRxSocket.h" -#include "logger.h" -#include "network_utils.h" -#include "sls_detector_exceptions.h" +#include "sls/UdpRxSocket.h" +#include "sls/logger.h" +#include "sls/network_utils.h" +#include "sls/sls_detector_exceptions.h" #include #include #include diff --git a/slsSupportLib/src/ZmqSocket.cpp b/slsSupportLib/src/ZmqSocket.cpp index 0a5d97217..f044eb48a 100644 --- a/slsSupportLib/src/ZmqSocket.cpp +++ b/slsSupportLib/src/ZmqSocket.cpp @@ -1,6 +1,6 @@ -#include "ZmqSocket.h" -#include "logger.h" -#include "network_utils.h" //ip +#include "sls/ZmqSocket.h" +#include "sls/logger.h" +#include "sls/network_utils.h" //ip #include #include #include diff --git a/slsSupportLib/src/file_utils.cpp b/slsSupportLib/src/file_utils.cpp index 100019d8c..d23c619f1 100644 --- a/slsSupportLib/src/file_utils.cpp +++ b/slsSupportLib/src/file_utils.cpp @@ -1,6 +1,6 @@ -#include "file_utils.h" -#include "logger.h" -#include "sls_detector_exceptions.h" +#include "sls/file_utils.h" +#include "sls/logger.h" +#include "sls/sls_detector_exceptions.h" #include #include diff --git a/slsSupportLib/src/network_utils.cpp b/slsSupportLib/src/network_utils.cpp index cca34c3e5..2f05e948c 100644 --- a/slsSupportLib/src/network_utils.cpp +++ b/slsSupportLib/src/network_utils.cpp @@ -1,6 +1,6 @@ -#include "sls_detector_exceptions.h" +#include "sls/sls_detector_exceptions.h" -#include "network_utils.h" +#include "sls/network_utils.h" #include #include #include diff --git a/slsSupportLib/src/sls_detector_exceptions.cpp b/slsSupportLib/src/sls_detector_exceptions.cpp index 23ca4b9fb..c8753e5db 100644 --- a/slsSupportLib/src/sls_detector_exceptions.cpp +++ b/slsSupportLib/src/sls_detector_exceptions.cpp @@ -1,5 +1,5 @@ -#include "sls_detector_exceptions.h" -#include "logger.h" +#include "sls/sls_detector_exceptions.h" +#include "sls/logger.h" namespace sls { RuntimeError::RuntimeError() : runtime_error("SLS Detector Package Failed") { LOG(logERROR) << "SLS Detector Package Failed"; diff --git a/slsSupportLib/src/string_utils.cpp b/slsSupportLib/src/string_utils.cpp index 1846fccf8..087ad3ce1 100755 --- a/slsSupportLib/src/string_utils.cpp +++ b/slsSupportLib/src/string_utils.cpp @@ -1,7 +1,7 @@ -#include "string_utils.h" -#include "container_utils.h" -#include "network_utils.h" +#include "sls/string_utils.h" +#include "sls/container_utils.h" +#include "sls/network_utils.h" #include #include #include diff --git a/slsSupportLib/tests/test-Sockets.cpp b/slsSupportLib/tests/test-Sockets.cpp index 34ddfd92a..97ddb1163 100644 --- a/slsSupportLib/tests/test-Sockets.cpp +++ b/slsSupportLib/tests/test-Sockets.cpp @@ -1,5 +1,5 @@ -#include "ClientSocket.h" -#include "ServerSocket.h" +#include "sls/ClientSocket.h" +#include "sls/ServerSocket.h" #include "catch.hpp" #include #include diff --git a/slsSupportLib/tests/test-StaticVector.cpp b/slsSupportLib/tests/test-StaticVector.cpp index e8611611d..a529173d2 100644 --- a/slsSupportLib/tests/test-StaticVector.cpp +++ b/slsSupportLib/tests/test-StaticVector.cpp @@ -1,5 +1,5 @@ -#include "StaticVector.h" -#include "TypeTraits.h" +#include "sls/StaticVector.h" +#include "sls/TypeTraits.h" #include "catch.hpp" #include diff --git a/slsSupportLib/tests/test-Timer.cpp b/slsSupportLib/tests/test-Timer.cpp index e382cc340..518e5235c 100755 --- a/slsSupportLib/tests/test-Timer.cpp +++ b/slsSupportLib/tests/test-Timer.cpp @@ -1,4 +1,4 @@ -#include "Timer.h" +#include "sls/Timer.h" #include "catch.hpp" #include diff --git a/slsSupportLib/tests/test-ToString.cpp b/slsSupportLib/tests/test-ToString.cpp index 6eabadc4b..a550e4947 100644 --- a/slsSupportLib/tests/test-ToString.cpp +++ b/slsSupportLib/tests/test-ToString.cpp @@ -1,8 +1,8 @@ -#include "TimeHelper.h" -#include "ToString.h" +#include "sls/TimeHelper.h" +#include "sls/ToString.h" #include "catch.hpp" -#include "network_utils.h" -#include "sls_detector_defs.h" +#include "sls/network_utils.h" +#include "sls/sls_detector_defs.h" #include #include #include diff --git a/slsSupportLib/tests/test-TypeTraits.cpp b/slsSupportLib/tests/test-TypeTraits.cpp index f12fc355d..f9515a3f0 100644 --- a/slsSupportLib/tests/test-TypeTraits.cpp +++ b/slsSupportLib/tests/test-TypeTraits.cpp @@ -1,4 +1,4 @@ -#include "TypeTraits.h" +#include "sls/TypeTraits.h" #include "catch.hpp" #include #include diff --git a/slsSupportLib/tests/test-UdpRxSocket.cpp b/slsSupportLib/tests/test-UdpRxSocket.cpp index 194310499..a01605b0f 100644 --- a/slsSupportLib/tests/test-UdpRxSocket.cpp +++ b/slsSupportLib/tests/test-UdpRxSocket.cpp @@ -1,6 +1,6 @@ -#include "UdpRxSocket.h" +#include "sls/UdpRxSocket.h" #include "catch.hpp" -#include "sls_detector_exceptions.h" +#include "sls/sls_detector_exceptions.h" #include #include #include diff --git a/slsSupportLib/tests/test-ZmqSocket.cpp b/slsSupportLib/tests/test-ZmqSocket.cpp index 520738bae..519ef5068 100644 --- a/slsSupportLib/tests/test-ZmqSocket.cpp +++ b/slsSupportLib/tests/test-ZmqSocket.cpp @@ -1,4 +1,4 @@ -#include "ZmqSocket.h" +#include "sls/ZmqSocket.h" #include "catch.hpp" TEST_CASE("Throws when cannot create socket") { diff --git a/slsSupportLib/tests/test-bit_utils.cpp b/slsSupportLib/tests/test-bit_utils.cpp index fb2b19353..468e3a547 100644 --- a/slsSupportLib/tests/test-bit_utils.cpp +++ b/slsSupportLib/tests/test-bit_utils.cpp @@ -1,4 +1,4 @@ -#include "bit_utils.h" +#include "sls/bit_utils.h" #include "catch.hpp" #include diff --git a/slsSupportLib/tests/test-container_utils.cpp b/slsSupportLib/tests/test-container_utils.cpp index 0defcd677..25ad3c331 100644 --- a/slsSupportLib/tests/test-container_utils.cpp +++ b/slsSupportLib/tests/test-container_utils.cpp @@ -1,5 +1,5 @@ #include "catch.hpp" -#include "container_utils.h" +#include "sls/container_utils.h" #include #include #include diff --git a/slsSupportLib/tests/test-logger.cpp b/slsSupportLib/tests/test-logger.cpp index 41c260b86..aa6814d89 100644 --- a/slsSupportLib/tests/test-logger.cpp +++ b/slsSupportLib/tests/test-logger.cpp @@ -1,5 +1,5 @@ #include "catch.hpp" -#include "logger.h" +#include "sls/logger.h" #include #include #include diff --git a/slsSupportLib/tests/test-network_utils.cpp b/slsSupportLib/tests/test-network_utils.cpp index c516c6f92..295da4c10 100644 --- a/slsSupportLib/tests/test-network_utils.cpp +++ b/slsSupportLib/tests/test-network_utils.cpp @@ -1,12 +1,12 @@ #include "catch.hpp" -#include "network_utils.h" +#include "sls/network_utils.h" #include #include #include -#include "sls_detector_exceptions.h" -#include "string_utils.h" +#include "sls/sls_detector_exceptions.h" +#include "sls/string_utils.h" using namespace sls; diff --git a/slsSupportLib/tests/test-sls_detector_defs.cpp b/slsSupportLib/tests/test-sls_detector_defs.cpp index ffd2971f8..95c6a4bd9 100644 --- a/slsSupportLib/tests/test-sls_detector_defs.cpp +++ b/slsSupportLib/tests/test-sls_detector_defs.cpp @@ -1,5 +1,5 @@ #include "catch.hpp" -#include "sls_detector_defs.h" +#include "sls/sls_detector_defs.h" using dt = slsDetectorDefs::detectorType; diff --git a/slsSupportLib/tests/test-string_utils.cpp b/slsSupportLib/tests/test-string_utils.cpp index ef69f96bc..765250b4f 100644 --- a/slsSupportLib/tests/test-string_utils.cpp +++ b/slsSupportLib/tests/test-string_utils.cpp @@ -1,9 +1,9 @@ #include "catch.hpp" -#include "logger.h" +#include "sls/logger.h" #include #include -#include "string_utils.h" +#include "sls/string_utils.h" TEST_CASE("copy a string") { diff --git a/tests/include/tests/config.h b/tests/include/tests/config.h index 56af0b4e4..e7192bd52 100644 --- a/tests/include/tests/config.h +++ b/tests/include/tests/config.h @@ -1,5 +1,5 @@ #pragma once -#include "sls_detector_defs.h" +#include "sls/sls_detector_defs.h" #include struct SingleDetectorConfig { diff --git a/tests/include/tests/globals.h b/tests/include/tests/globals.h index 7e6ccdaa3..5eea9a84f 100644 --- a/tests/include/tests/globals.h +++ b/tests/include/tests/globals.h @@ -1,5 +1,5 @@ #pragma once -#include "sls_detector_defs.h" +#include "sls/sls_detector_defs.h" using dt = slsDetectorDefs::detectorType; using di = slsDetectorDefs::dacIndex; using defs = slsDetectorDefs; diff --git a/tests/src/testclient.cpp b/tests/src/testclient.cpp index 8d88b9f7d..c051bca4a 100644 --- a/tests/src/testclient.cpp +++ b/tests/src/testclient.cpp @@ -1,9 +1,9 @@ -#include "ClientSocket.h" +#include "sls/ClientSocket.h" #include "clara.hpp" -#include "sls_detector_exceptions.h" +#include "sls/sls_detector_exceptions.h" #include "tests/testenum.h" -#include "container_utils.h" +#include "sls/container_utils.h" #include bool help = false; diff --git a/tests/src/testserver.cpp b/tests/src/testserver.cpp index d418aac2a..69024adad 100644 --- a/tests/src/testserver.cpp +++ b/tests/src/testserver.cpp @@ -1,10 +1,10 @@ -#include "ServerSocket.h" +#include "sls/ServerSocket.h" #include "clara.hpp" #include "tests/testenum.h" -#include "ServerInterface.h" -#include "container_utils.h" +#include "sls/ServerInterface.h" +#include "sls/container_utils.h" #include #include diff --git a/tests/test.cpp b/tests/test.cpp index 161e2f013..452506a67 100755 --- a/tests/test.cpp +++ b/tests/test.cpp @@ -3,9 +3,9 @@ // #include "catch.hpp" #define CATCH_CONFIG_RUNNER -#include "ToString.h" +#include "sls/ToString.h" #include "catch.hpp" -#include "sls_detector_defs.h" +#include "sls/sls_detector_defs.h" #include "tests/config.h" #include