Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer

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

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"
 

ctbGui/ctbAdcs.cpp

@@ -25,7 +25,7 @@
 
 #include "ctbAdcs.h"
 #include "ctbDefs.h"
-#include "Detector.h"
+#include "sls/Detector.h"
 
 using namespace std;
 

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;
 

ctbGui/ctbDefs.h

@@ -4,8 +4,8 @@
 #include <stdexcept>
 #include <chrono>
 
-//#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"

ctbGui/ctbGui.cpp

@@ -9,8 +9,8 @@
 #include <fstream>
 #include <string>
 
-#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"

ctbGui/ctbMain.cpp

@@ -34,7 +34,7 @@
 #include <fstream>
 #include <string>
 
-#include "Detector.h"
+#include "sls/Detector.h"
 #include "ctbDefs.h"
 #include "ctbMain.h"
 #include "ctbDacs.h"

ctbGui/ctbPattern.cpp

@@ -25,7 +25,7 @@
 
 #include "ctbPattern.h"
 #include "ctbDefs.h"
-#include "Detector.h"
+#include "sls/Detector.h"
 #include <chrono>
 using namespace std;
 

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;
 

ctbGui/ctbSignals.cpp

@@ -35,7 +35,7 @@
 
 #include "ctbSignals.h"
 #include "ctbDefs.h"
-#include "Detector.h"
+#include "sls/Detector.h"
 
 using namespace std;
 

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;
 

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 <iostream>
     int main(){
 

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 <chrono>
     ...
     std::chrono::microseconds t0{500};

docs/src/gendoc.cpp

@@ -10,8 +10,8 @@
 #include <vector>
 
 #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) {

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 <iostream>
 

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 <iostream>
 #include <vector>
 #define VERBOSE

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 <iostream>
 

python/src/detector.cpp

@@ -6,13 +6,13 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#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 <array>
 #include <chrono>
 namespace py = pybind11;

python/src/detector_in.cpp

@@ -3,13 +3,13 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#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 <array>
 #include <chrono>
 namespace py = pybind11;

python/src/enums.cpp

@@ -6,7 +6,7 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "sls_detector_defs.h"
+#include "sls/sls_detector_defs.h"
 namespace py = pybind11;
 void init_enums(py::module &m) {
     py::class_<slsDetectorDefs> Defs(m, "slsDetectorDefs");

python/src/enums_in.cpp

@@ -3,7 +3,7 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "sls_detector_defs.h"
+#include "sls/sls_detector_defs.h"
 namespace py = pybind11;
 void init_enums(py::module &m) {
     py::class_<slsDetectorDefs> Defs(m, "slsDetectorDefs");

python/src/main.cpp

@@ -3,8 +3,8 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "Detector.h"
-#include "Result.h"
+#include "sls/Detector.h"
+#include "sls/Result.h"
 #include "mythenFileIO.h"
 #include <chrono>
 #include <vector>

python/src/network.cpp

@@ -9,7 +9,7 @@ classes.
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "network_utils.h"
+#include "sls/network_utils.h"
 namespace py = pybind11;
 using sls::IpAddr;
 using sls::MacAddr;

python/src/typecaster.h

@@ -1,6 +1,6 @@
 #pragma once
 #include <pybind11/pybind11.h>
-#include "Result.h"
+#include "sls/Result.h"
 // Add type_typecaster to pybind for our wrapper type
 namespace pybind11 {
 namespace detail {

sample/api.cpp

@@ -1,9 +1,9 @@
-#include "Detector.h"
+#include <sls/Detector.h>
 
 #include <chrono>
 #include <iostream>
-#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;

sample/time.cpp

@@ -3,10 +3,10 @@
 #include <string>
 #include <memory>
 
-#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 <algorithm>
 
 std::chrono::nanoseconds to_nano(double val, const std::string &unit) {

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 <chrono>
 #include <fmt/format.h>
 #include <iostream>
 #include <thread>
-#include "network_utils.h"
+#include "sls/network_utils.h"
 
 // Assume packages arrive in order
 

sample/useResult.cpp

@@ -1,7 +1,7 @@
 /** Examples on how to use Result<T> */
 
-#include "Result.h"
-#include "ToString.h"
+#include "sls/Result.h"
+#include "sls/ToString.h"
 #include <algorithm>
 #include <iostream>
 

sample/using_logger.cpp

@@ -1,4 +1,4 @@
-#include "logger.h"
+#include "sls/logger.h"
 #include <iostream>
 #include <chrono>
 int main() {

slsDetectorCalibration/moenchExecutables/CMakeLists.txt

@@ -1,4 +1,5 @@
 
+find_package(TIFF REQUIRED)
 
 #Moench ZMQ
 add_executable(moenchZmqProcess moenchZmqProcess.cpp ../tiffIO.cpp)

slsDetectorCalibration/moenchExecutables/moench03ClusterFinder.cpp

@@ -1,4 +1,4 @@
-//#include "ansi.h"
+//#include "sls/ansi.h"
 #include <iostream>
 
 

slsDetectorCalibration/moenchExecutables/moench03Interpolation.cpp

@@ -1,5 +1,5 @@
 
-#include "ansi.h"
+#include "sls/ansi.h"
 #include <iostream>
 
 //#include "moench03T1ZmqData.h"

slsDetectorCalibration/moenchExecutables/moench03NoInterpolation.cpp

@@ -1,5 +1,5 @@
 
-#include "ansi.h"
+#include "sls/ansi.h"
 #include <iostream>
 
 #include "single_photon_hit.h"

slsDetectorCalibration/moenchExecutables/moenchPhotonCounter.cpp

@@ -1,4 +1,4 @@
-//#include "ansi.h"
+//#include "sls/ansi.h"
 #include <iostream>
 #define CORR
 

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 <iostream>
 
 #include <chrono>

slsDetectorCalibration/multiThreadedAnalogDetector.h

@@ -17,7 +17,7 @@
 #include <pthread.h>
 
 #include "analogDetector.h"
-#include "CircularFifo.h"
+#include "sls/CircularFifo.h"
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>

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 <string>
 

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 <QAbstractButton>
 #include <QMessageBox>

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 <QTabWidget>

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 <mutex>

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;

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 {

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;

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 <vector>
 

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;

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;

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 {

slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h

@@ -2,7 +2,7 @@
 #define SLSQT1DPLOT_H
 
 #include "SlsQt1DZoomer.h"
-#include "ansi.h"
+#include "sls/ansi.h"
 #include <qwt_plot.h>
 #include <qwt_plot_curve.h>
 #include <qwt_plot_marker.h>

slsDetectorGui/slsDetectorPlotting/src/SlsQt2DHist.cpp

@@ -1,6 +1,6 @@
 /* TODO! short description */
 #include "SlsQt2DHist.h"
-#include "ansi.h"
+#include "sls/ansi.h"
 #include <cmath>
 #include <iostream>
 

slsDetectorGui/slsDetectorPlotting/src/SlsQt2DPlot.cpp

@@ -1,5 +1,5 @@
 #include "SlsQt2DPlot.h"
-// #include "ansi.h"
+// #include "sls/ansi.h"
 
 #include <qlist.h>
 #include <qprinter.h>

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 <QFileDialog>
 #include <QPlastiqueStyle>

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 <QFileDialog>
 #include <QPainter>

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"
 

slsDetectorGui/src/qTabDebugging.cpp

@@ -1,5 +1,5 @@
 #include "qTabDebugging.h"
-#include "ToString.h"
+#include "sls/ToString.h"
 #include "qDefs.h"
 #include <QDesktopWidget>
 #include <QGridLayout>

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 <QStandardItemModel>
 #include <QTimer>
 

slsDetectorGui/src/qTabSettings.cpp

@@ -1,5 +1,5 @@
 #include "qTabSettings.h"
-#include "ToString.h"
+#include "sls/ToString.h"
 #include "qDefs.h"
 #include <QStandardItemModel>
 

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

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

slsDetectorServers/eigerDetectorServer/9mhvserial_bf.c

@@ -1,4 +1,4 @@
-#include "ansi.h"
+#include "sls/ansi.h"
 
 #include <errno.h>
 #include <fcntl.h>         // File control definitions

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"

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"

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

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"

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

slsDetectorServers/gotthardDetectorServer/slsDetectorServer_defs.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "sls_detector_defs.h"
+#include "sls/sls_detector_defs.h"
 #include <stdlib.h>
 
 /* Enums */

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

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

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

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

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

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"

slsDetectorServers/slsDetectorServer/include/clogger.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "ansi.h"
+#include "sls/ansi.h"
 
 #include <stdarg.h>
 #include <stdio.h>

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;
 

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);

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)

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)

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)

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 <unistd.h> // usleep
 

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 <getopt.h>
 #include <stdint.h>

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"
 

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 <string.h>
 

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 <string.h>
 

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 */
 

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 <arpa/inet.h>
 #include <errno.h>

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 <fcntl.h>    // open
 #include <sys/mman.h> // mmap

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 <libgen.h> // dirname
 #include <string.h>

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 <arpa/inet.h>
 #include <errno.h>

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 <fcntl.h> // open
 #include <string.h>

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"
 

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"
 

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 <string.h>
 

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 <getopt.h>
 #include <signal.h>

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 <arpa/inet.h>
 #include <pthread.h>

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
 )

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>

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 {
 

slsDetectorSoftware/src/CmdLineApp.cpp

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

slsDetectorSoftware/src/CmdParser.cpp

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

slsDetectorSoftware/src/CmdProxy.cpp

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