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

updated i3gbe to lll

Browse Source
This commit is contained in:
maliakal_d
2021-08-06 16:08:07 +02:00
parent bc5d6a0309
commit 2c53a134cd
17 changed files with 121 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,7 @@ 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);
std::string ToString(const defs::ethernetInterface s);
std::string ToString(const defs::streamingInterface s);
std::string ToString(const defs::vetoAlgorithm s);
std::string ToString(const slsDetectorDefs::xy &coord);
@ -299,7 +299,7 @@ template <> defs::readoutMode StringTo(const std::string &s);
template <> defs::dacIndex StringTo(const std::string &s);
template <> defs::burstMode StringTo(const std::string &s);
template <> defs::timingSourceType StringTo(const std::string &s);
template <> defs::ethernetInterface StringTo(const std::string &s);
template <> defs::streamingInterface StringTo(const std::string &s);
template <> defs::vetoAlgorithm StringTo(const std::string &s);
template <> uint32_t StringTo(const std::string &s);

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

@ -395,14 +395,14 @@ typedef struct {
enum timingSourceType { TIMING_INTERNAL, TIMING_EXTERNAL };
#ifdef __cplusplus
enum class ethernetInterface {
enum class streamingInterface {
#else
enum ethernetInterface {
enum streamingInterface {
#endif
NONE = 0,
I3GBE = 1 << 0,
I10GBE = 1 << 1,
ALL = I3GBE | I10GBE
LOW_LATENCY_LINK = 1 << 0,
ETHERNET_10GB = 1 << 1,
ALL = LOW_LATENCY_LINK | ETHERNET_10GB
};
enum vetoAlgorithm { DEFAULT_ALGORITHM };
@ -498,17 +498,17 @@ typedef struct {
#ifdef __cplusplus
};
inline slsDetectorDefs::ethernetInterface
operator|(const slsDetectorDefs::ethernetInterface &a,
const slsDetectorDefs::ethernetInterface &b) {
return slsDetectorDefs::ethernetInterface(static_cast<int32_t>(a) |
inline slsDetectorDefs::streamingInterface
operator|(const slsDetectorDefs::streamingInterface &a,
const slsDetectorDefs::streamingInterface &b) {
return slsDetectorDefs::streamingInterface(static_cast<int32_t>(a) |
static_cast<int32_t>(b));
};
inline slsDetectorDefs::ethernetInterface
operator&(const slsDetectorDefs::ethernetInterface &a,
const slsDetectorDefs::ethernetInterface &b) {
return slsDetectorDefs::ethernetInterface(static_cast<int32_t>(a) &
inline slsDetectorDefs::streamingInterface
operator&(const slsDetectorDefs::streamingInterface &a,
const slsDetectorDefs::streamingInterface &b) {
return slsDetectorDefs::streamingInterface(static_cast<int32_t>(a) &
static_cast<int32_t>(b));
};
#endif