detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-05 17:40:40 +02:00
Code Issues Actions Packages Releases Activity

Formatting (#742)

Browse Source
This commit is contained in:
maliakal_d 2023-05-11 10:17:24 +02:00 committed by GitHub
parent 4c6be26846
commit da4dd0df7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsReceiverSoftware/src/Implementation.cpp
View File

@ -235,7 +235,7 @@ const slsDetectorDefs::xy Implementation::GetPortGeometry() const {
const slsDetectorDefs::ROI Implementation::GetMaxROIPerPort() const { const slsDetectorDefs::ROI Implementation::GetMaxROIPerPort() const {
return slsDetectorDefs::ROI{0, (int)generalData->nPixelsX - 1, 0, return slsDetectorDefs::ROI{0, (int)generalData->nPixelsX - 1, 0,
(int)generalData->nPixelsY - 1}; (int)generalData->nPixelsY - 1};
} }
void Implementation::setDetectorSize(const slsDetectorDefs::xy size) { void Implementation::setDetectorSize(const slsDetectorDefs::xy size) {

4
slsSupportLib/include/sls/ZmqSocket.h
View File

@ -12,8 +12,8 @@
#include "sls/container_utils.h" #include "sls/container_utils.h"
#include "sls/sls_detector_exceptions.h" #include "sls/sls_detector_exceptions.h"
#include <map>
#include <array> #include <array>
#include <map>
#include <memory> #include <memory>
// Selective suppression of warning in gcc, // Selective suppression of warning in gcc,
@ -85,7 +85,7 @@ struct zmqHeader {
/** additional json header */ /** additional json header */
std::map<std::string, std::string> addJsonHeader; std::map<std::string, std::string> addJsonHeader;
/** (xmin, xmax, ymin, ymax) roi only in files written */ /** (xmin, xmax, ymin, ymax) roi only in files written */
std::array<int,4> rx_roi{}; std::array<int, 4> rx_roi{};
}; };
class ZmqSocket { class ZmqSocket {

1
slsSupportLib/include/sls/network_utils.h
View File

@ -5,7 +5,6 @@
#include <cstdint> #include <cstdint>
#include <iostream> #include <iostream>
#include <string> #include <string>
#include <cstdint>
namespace sls { namespace sls {

4
slsSupportLib/include/sls/versionAPI.h
View File

@ -9,5 +9,5 @@
#define APILIB "developer 0x230224" #define APILIB "developer 0x230224"
#define APIRECEIVER "developer 0x230224" #define APIRECEIVER "developer 0x230224"
#define APIEIGER "developer 0x230224" #define APIEIGER "developer 0x230224"
#define APIJUNGFRAU "developer 0x230508" #define APIJUNGFRAU "developer 0x230508"
#define APIMOENCH "developer 0x230508" #define APIMOENCH "developer 0x230508"