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
2021-08-06 16:41:39 +02:00
parent e62fc1907f e92270565b
commit dc921733d0
20 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,13 +36,9 @@ std::string ToString(const defs::dacIndex s);
std::string ToString(const std::vector<defs::dacIndex> &vec);
std::string ToString(const defs::burstMode s);
std::string ToString(const defs::timingSourceType s);
<<<<<<< HEAD
std::string ToString(const defs::M3_GainCaps s);
std::string ToString(const defs::portPosition s);
std::string ToString(const defs::ethernetInterface s);
=======
std::string ToString(const defs::streamingInterface s);
>>>>>>> 5.2.0-rc
std::string ToString(const defs::vetoAlgorithm s);
std::string ToString(const defs::gainMode s);

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

@ -416,7 +416,7 @@ typedef struct {
enum vetoAlgorithm { DEFAULT_ALGORITHM };
enum gainMode {
DYNAMIC_GAIN_MODE,
DYNAMIC,
FORCE_SWITCH_G1,
FORCE_SWITCH_G2,
FIX_G1,

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

@ -3,7 +3,6 @@
#define APILIB 0x210225
#define APIRECEIVER 0x210225
#define APIGUI 0x210225
#define APIEIGER 0x210806
#define APICTB 0x210806
#define APIGOTTHARD 0x210806