clang-format

slsDetectorGui/include/qDetectorMain.h

@@ -1,6 +1,6 @@
 #pragma once
-#include "sls/Detector.h"
 #include "qDefs.h"
+#include "sls/Detector.h"
 #include "ui_form_detectormain.h"
 #include <QTabWidget>
 

slsDetectorGui/src/qTabAdvanced.cpp

@@ -1,7 +1,7 @@
 #include "qTabAdvanced.h"
-#include "sls/network_utils.h"
 #include "qDefs.h"
 #include "qDrawPlot.h"
+#include "sls/network_utils.h"
 
 qTabAdvanced::qTabAdvanced(QWidget *parent, sls::Detector *detector,
                            qDrawPlot *p)

slsDetectorGui/src/qTabDebugging.cpp

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

slsDetectorGui/src/qTabSettings.cpp

@@ -1,6 +1,6 @@
 #include "qTabSettings.h"
-#include "sls/ToString.h"
 #include "qDefs.h"
+#include "sls/ToString.h"
 #include <QStandardItemModel>
 
 qTabSettings::qTabSettings(QWidget *parent, sls::Detector *detector)

slsDetectorServers/slsDetectorServer/src/blackfin.c

@@ -1,7 +1,7 @@
 #include "blackfin.h"
 #include "RegisterDefs.h"
-#include "sls/ansi.h"
 #include "clogger.h"
+#include "sls/ansi.h"
 #include "sls/sls_detector_defs.h"
 
 #include <fcntl.h>    // open

slsDetectorServers/slsDetectorServer/src/nios.c

@@ -1,8 +1,8 @@
 #include "nios.h"
 #include "RegisterDefs.h"
-#include "sls/ansi.h"
 #include "clogger.h"
 #include "common.h"
+#include "sls/ansi.h"
 #include "sls/sls_detector_defs.h"
 
 #include <fcntl.h> // open

slsDetectorServers/slsDetectorServer/src/programFpgaBlackfin.c

@@ -1,6 +1,6 @@
 #include "programFpgaBlackfin.h"
-#include "sls/ansi.h"
 #include "clogger.h"
+#include "sls/ansi.h"
 #include "slsDetectorServer_defs.h"
 
 #include <string.h>

slsDetectorServers/slsDetectorServer/src/programFpgaNios.c

@@ -1,6 +1,6 @@
 #include "programFpgaNios.h"
-#include "sls/ansi.h"
 #include "clogger.h"
+#include "sls/ansi.h"
 #include "slsDetectorServer_defs.h"
 
 #include <string.h>

slsDetectorServers/slsDetectorServer/src/readDefaultPattern.c

@@ -1,9 +1,9 @@
 #include "readDefaultPattern.h"
-#include "sls/ansi.h"
 #include "clogger.h"
 #include "common.h"
-#include "slsDetectorServer_defs.h"
+#include "sls/ansi.h"
 #include "sls/sls_detector_defs.h"
+#include "slsDetectorServer_defs.h"
 
 #include <string.h>
 

slsDetectorServers/slsDetectorServer/src/slsDetectorServer.c

@@ -4,10 +4,10 @@
 #include "clogger.h"
 #include "communication_funcs.h"
 #include "sharedMemory.h"
-#include "slsDetectorServer_defs.h"
-#include "slsDetectorServer_funcs.h"
 #include "sls/sls_detector_defs.h"
 #include "sls/versionAPI.h"
+#include "slsDetectorServer_defs.h"
+#include "slsDetectorServer_funcs.h"
 
 #include <getopt.h>
 #include <signal.h>
@@ -110,8 +110,8 @@ int main(int argc, char *argv[]) {
 #elif GOTTHARD2D
             version = APIGOTTHARD2;
 #endif
-            LOG(logINFO, ("SLS Detector Server Version: %s (0x%x)\n",
+            LOG(logINFO, ("SLS Detector Server Version: %s (0x%x)\n", GITBRANCH,
-                              GITBRANCH, version));
+                          version));
             exit(EXIT_SUCCESS);
 
         case 'p':

slsDetectorSoftware/src/DetectorImpl.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "sls/Result.h"
 #include "SharedMemory.h"
+#include "sls/Result.h"
 #include "sls/logger.h"
 #include "sls/sls_detector_defs.h"
 

slsDetectorSoftware/tests/test-CmdProxy-global.cpp

@@ -1,7 +1,7 @@
 #include "test-CmdProxy-global.h"
 #include "CmdProxy.h"
-#include "sls/Detector.h"
 #include "catch.hpp"
+#include "sls/Detector.h"
 #include "tests/globals.h"
 
 using sls::CmdProxy;

slsDetectorSoftware/tests/test-Result.cpp

@@ -1,7 +1,7 @@
+#include "catch.hpp"
 #include "sls/Result.h"
 #include "sls/ToString.h"
 #include "sls/TypeTraits.h"
-#include "catch.hpp"
 #include <string>
 
 using sls::Result;

slsReceiverSoftware/include/sls/CircularFifo.h

@@ -130,4 +130,4 @@ size_t CircularFifo<Element>::increment(size_t i) const {
     return i;
 }
 
-}
+} // namespace sls

slsReceiverSoftware/include/sls/Receiver.h

@@ -4,8 +4,7 @@
 
 class ClientInterface;
 
-namespace sls
+namespace sls {
-{
 
 class Receiver : private virtual slsDetectorDefs {
 

slsReceiverSoftware/src/ClientInterface.h

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

slsReceiverSoftware/src/DataProcessor.h

@@ -51,8 +51,8 @@ class DataProcessor : private virtual slsDetectorDefs, public ThreadObject {
     DataProcessor(int ind, detectorType dtype, Fifo *f, fileFormat *ftype,
                   bool fwenable, bool *mfwenable, bool *dsEnable,
                   uint32_t *freq, uint32_t *timer, uint32_t *sfnum, bool *fp,
-                  bool *act, bool *depaden, bool *sm,
+                  bool *act, bool *depaden, bool *sm, std::vector<int> *cdl,
-                  std::vector<int> *cdl, int *cdo, int *cad);
+                  int *cdo, int *cad);
 
     /**
      * Destructor

slsReceiverSoftware/src/File.h

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

slsReceiverSoftware/src/GeneralData.h

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

slsReceiverSoftware/src/Implementation.h

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

slsReceiverSoftware/src/Receiver.cpp

@@ -145,4 +145,4 @@ void Receiver::registerCallBackRawDataModifyReady(
     tcpipInterface->registerCallBackRawDataModifyReady(func, arg);
 }
 
-}
+} // namespace sls

slsReceiverSoftware/tests/test-CircularFifo.cpp

@@ -1,5 +1,5 @@
-#include "sls/CircularFifo.h"
 #include "catch.hpp"
+#include "sls/CircularFifo.h"
 #include <vector>
 
 using sls::CircularFifo;

slsSupportLib/include/sls/string_utils.h

@@ -54,4 +54,3 @@ std::string RemoveUnit(std::string &str);
 
 bool is_int(const std::string &s);
 } // namespace sls
-

slsSupportLib/tests/test-Sockets.cpp

@@ -1,6 +1,6 @@
+#include "catch.hpp"
 #include "sls/ClientSocket.h"
 #include "sls/ServerSocket.h"
-#include "catch.hpp"
 #include <chrono>
 #include <future>
 #include <iostream>

slsSupportLib/tests/test-StaticVector.cpp

@@ -1,6 +1,6 @@
+#include "catch.hpp"
 #include "sls/StaticVector.h"
 #include "sls/TypeTraits.h"
-#include "catch.hpp"
 
 #include <array>
 #include <sstream>

slsSupportLib/tests/test-Timer.cpp

@@ -1,5 +1,5 @@
-#include "sls/Timer.h"
 #include "catch.hpp"
+#include "sls/Timer.h"
 
 #include <chrono>
 #include <thread>

slsSupportLib/tests/test-ToString.cpp

@@ -1,6 +1,6 @@
+#include "catch.hpp"
 #include "sls/TimeHelper.h"
 #include "sls/ToString.h"
-#include "catch.hpp"
 #include "sls/network_utils.h"
 #include "sls/sls_detector_defs.h"
 #include <array>

slsSupportLib/tests/test-TypeTraits.cpp

@@ -1,5 +1,5 @@
-#include "sls/TypeTraits.h"
 #include "catch.hpp"
+#include "sls/TypeTraits.h"
 #include <array>
 #include <chrono>
 #include <initializer_list>

slsSupportLib/tests/test-UdpRxSocket.cpp

@@ -1,5 +1,5 @@
-#include "sls/UdpRxSocket.h"
 #include "catch.hpp"
+#include "sls/UdpRxSocket.h"
 #include "sls/sls_detector_exceptions.h"
 #include <cstdint>
 #include <errno.h>

slsSupportLib/tests/test-ZmqSocket.cpp

@@ -1,5 +1,5 @@
-#include "sls/ZmqSocket.h"
 #include "catch.hpp"
+#include "sls/ZmqSocket.h"
 
 TEST_CASE("Throws when cannot create socket") {
     REQUIRE_THROWS(ZmqSocket("sdiasodjajpvv", 5076001));

slsSupportLib/tests/test-bit_utils.cpp

@@ -1,5 +1,5 @@
-#include "sls/bit_utils.h"
 #include "catch.hpp"
+#include "sls/bit_utils.h"
 #include <vector>
 
 TEST_CASE("Get set bits from 0") {

tests/src/testclient.cpp

@@ -1,5 +1,5 @@
-#include "sls/ClientSocket.h"
 #include "clara.hpp"
+#include "sls/ClientSocket.h"
 #include "sls/sls_detector_exceptions.h"
 #include "tests/testenum.h"
 

tests/src/testserver.cpp

@@ -1,5 +1,5 @@
-#include "sls/ServerSocket.h"
 #include "clara.hpp"
+#include "sls/ServerSocket.h"
 
 #include "tests/testenum.h"
 

tests/test.cpp

@@ -3,8 +3,8 @@
 // #include "catch.hpp"
 
 #define CATCH_CONFIG_RUNNER
-#include "sls/ToString.h"
 #include "catch.hpp"
+#include "sls/ToString.h"
 #include "sls/sls_detector_defs.h"
 #include "tests/config.h"
 #include <string>