mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-23 10:07:59 +02:00
@ -192,8 +192,7 @@ bool operator!=(const std::vector<T> &lhs,
|
||||
}
|
||||
|
||||
template <typename T, size_t Capacity>
|
||||
std::ostream &operator<<(std::ostream &os,
|
||||
const StaticVector<T, Capacity> &c) {
|
||||
std::ostream &operator<<(std::ostream &os, const StaticVector<T, Capacity> &c) {
|
||||
return os << ToString(c);
|
||||
}
|
||||
|
||||
|
@ -9,8 +9,8 @@
|
||||
*@short functions to open/close zmq sockets
|
||||
*/
|
||||
|
||||
#include "sls/sls_detector_exceptions.h"
|
||||
#include "sls/container_utils.h"
|
||||
#include "sls/sls_detector_exceptions.h"
|
||||
|
||||
#include <map>
|
||||
#include <memory>
|
||||
@ -23,7 +23,6 @@ namespace sls {
|
||||
// #define ZMQ_DETAIL
|
||||
#define ROIVERBOSITY
|
||||
|
||||
|
||||
/** zmq header structure */
|
||||
struct zmqHeader {
|
||||
/** true if incoming data, false if end of acquisition */
|
||||
@ -224,8 +223,7 @@ class ZmqSocket {
|
||||
/** Socket descriptor */
|
||||
mySocketDescriptors sockfd;
|
||||
|
||||
std::unique_ptr<char[]> header_buffer =
|
||||
make_unique<char[]>(MAX_STR_LENGTH);
|
||||
std::unique_ptr<char[]> header_buffer = make_unique<char[]>(MAX_STR_LENGTH);
|
||||
};
|
||||
|
||||
} // namespace sls
|
||||
|
@ -69,8 +69,8 @@
|
||||
#define MAX_STR_LENGTH 1000
|
||||
#define SHORT_STR_LENGTH 20
|
||||
|
||||
#define MAX_PATTERN_LENGTH 0x2000
|
||||
#define MAX_PATTERN_LEVELS 6
|
||||
#define MAX_PATTERN_LENGTH 0x2000
|
||||
#define MAX_PATTERN_LEVELS 6
|
||||
#define M3_MAX_PATTERN_LEVELS 3
|
||||
|
||||
#define DEFAULT_STREAMING_TIMER_IN_MS 500
|
||||
@ -179,8 +179,8 @@ class slsDetectorDefs {
|
||||
ROI(int xmin, int xmax, int ymin, int 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});
|
||||
}
|
||||
return std::array<int, 4>({xmin, xmax, ymin, ymax});
|
||||
}
|
||||
constexpr bool completeRoi() const {
|
||||
return (xmin == -1 && xmax == -1 && ymin == -1 && ymax == -1);
|
||||
}
|
||||
|
@ -2,13 +2,13 @@
|
||||
// Copyright (C) 2021 Contributors to the SLS Detector Package
|
||||
/** API versions */
|
||||
#define GITBRANCH "developer"
|
||||
#define APILIB 0x220609
|
||||
#define APIRECEIVER 0x220609
|
||||
#define APIGUI 0x220609
|
||||
#define APICTB 0x220714
|
||||
#define APIGOTTHARD 0x220714
|
||||
#define APILIB 0x220609
|
||||
#define APIRECEIVER 0x220609
|
||||
#define APIGUI 0x220609
|
||||
#define APICTB 0x220714
|
||||
#define APIGOTTHARD 0x220714
|
||||
#define APIGOTTHARD2 0x220714
|
||||
#define APIJUNGFRAU 0x220714
|
||||
#define APIMYTHEN3 0x220714
|
||||
#define APIMOENCH 0x220714
|
||||
#define APIEIGER 0x220714
|
||||
#define APIJUNGFRAU 0x220714
|
||||
#define APIMYTHEN3 0x220714
|
||||
#define APIMOENCH 0x220714
|
||||
#define APIEIGER 0x220714
|
||||
|
Reference in New Issue
Block a user