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

merge fix

Browse Source
This commit is contained in:
maliakal_d
2022-02-03 09:43:06 +01:00
parent 158719e325 778fe17f2b
commit cace18e535
26 changed files with 209 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
slsSupportLib/include/sls/sls_detector_defs.h
View File

@ -563,6 +563,8 @@ enum streamingInterface {
#ifdef __cplusplus
};
//operators needed in ToString
inline slsDetectorDefs::streamingInterface
operator|(const slsDetectorDefs::streamingInterface &a,
const slsDetectorDefs::streamingInterface &b) {
@ -576,6 +578,9 @@ operator&(const slsDetectorDefs::streamingInterface &a,
return slsDetectorDefs::streamingInterface(static_cast<int32_t>(a) &
static_cast<int32_t>(b));
};
#endif
#ifdef __cplusplus

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

@ -6,10 +6,10 @@
#define APIRECEIVER 0x211124
#define APIGUI 0x211124
#define APICTB 0x220131
#define APIGOTTHARD 0x220131
#define APIGOTTHARD2 0x220131
#define APIJUNGFRAU 0x220131
#define APIMYTHEN3 0x220131
#define APIMOENCH 0x220131
#define APIEIGER 0x220131
#define APICTB 0x220203
#define APIGOTTHARD 0x220203
#define APIGOTTHARD2 0x220203
#define APIJUNGFRAU 0x220203
#define APIMYTHEN3 0x220203
#define APIMOENCH 0x220202
#define APIEIGER 0x220203