moved definitions around

slsdetectorgroup · Sep 6, 2024 · 581a2cc · 581a2cc
1 parent 27d2598
commit 581a2cc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/slsDetectorSoftware/src/CallerSpecial.cpp b/slsDetectorSoftware/src/CallerSpecial.cpp
@@ -1,4 +1,5 @@
 #include "Caller.h"
+#include "sls/ZmqSocket.h"
 #include "sls/bit_utils.h"
 #include "sls/file_utils.h"
 #include "sls/logger.h"

diff --git a/slsSupportLib/include/sls/ZmqSocket.h b/slsSupportLib/include/sls/ZmqSocket.h
@@ -38,6 +38,8 @@ namespace sls {
 #define DEFAULT_LOW_ZMQ_HWM_BUFFERSIZE (1024 * 1024) // 1MB
 #define DEFAULT_ZMQ_BUFFERSIZE (-1) // os default
 
+#define ZMQ_PUBLISHER_IP "0.0.0.0"
+
 /** zmq header structure */
 struct zmqHeader {
  /** true if incoming data, false if end of acquisition */

diff --git a/slsSupportLib/include/sls/sls_detector_defs.h b/slsSupportLib/include/sls/sls_detector_defs.h
@@ -67,8 +67,6 @@
 
 #define LOCALHOST_IP "127.0.0.1"
 
-#define ZMQ_PUBLISHER_IP "0.0.0.0"
-
 /** default maximum string length */
 #define MAX_STR_LENGTH 1000
 #define SHORT_STR_LENGTH 20
@@ -183,9 +181,9 @@ class slsDetectorDefs {
  int ymin{-1};
  int ymax{-1};
  ROI() = default;
- ROI(int xmin, int xmax) : xmin(xmin), xmax(xmax){};
+ ROI(int xmin, int xmax) : xmin(xmin), xmax(xmax) {};
  ROI(int xmin, int xmax, int ymin, int ymax)
- : xmin(xmin), xmax(xmax), ymin(ymin), ymax(ymax){};
+ : xmin(xmin), xmax(xmax), ymin(ymin), ymax(ymax) {};
  constexpr std::array<int, 4> getIntArray() const {
  return std::array<int, 4>({xmin, xmax, ymin, ymax});
  }
@@ -236,7 +234,7 @@ typedef struct {
  int x{0};
  int y{0};
  xy() = default;
- xy(int x, int y) : x(x), y(y){};
+ xy(int x, int y) : x(x), y(y) {};
  } __attribute__((packed));
 #endif