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

wip

Browse Source
This commit is contained in:
maliakal_d
2021-07-15 14:48:41 +02:00
parent 8354395f64
commit 4d7fb4e4e0
6 changed files with 64 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -405,18 +405,6 @@ typedef struct {
ALL = I3GBE | I10GBE
};
#ifdef __cplusplus
inline EthernetInterface operator|(EthernetInterface a,
EthernetInterface b) {
return EthernetInterface(static_cast<int32_t>(a) |
static_cast<int32_t>(b));
}
inline bool operator&(EthernetInterface a, EthernetInterface b) {
return (static_cast<int32_t>(a) & static_cast<int32_t>(b));
}
#endif
#ifdef __cplusplus
/** scan structure */
@ -508,8 +496,18 @@ typedef struct {
#ifdef __cplusplus
};
inline slsDetectorDefs::EthernetInterface
operator|(const slsDetectorDefs::EthernetInterface &a,
const slsDetectorDefs::EthernetInterface &b) {
return slsDetectorDefs::EthernetInterface(static_cast<int32_t>(a) |
static_cast<int32_t>(b));
};
inline bool operator&(const slsDetectorDefs::EthernetInterface &a,
const slsDetectorDefs::EthernetInterface &b) {
return (static_cast<int32_t>(a) & static_cast<int32_t>(b));
};
#endif
;
#ifdef __cplusplus
struct detParameters {

17
slsSupportLib/src/ToString.cpp
View File

@ -523,15 +523,15 @@ std::string ToString(const defs::EthernetInterface s) {
std::ostringstream os;
std::string rs;
switch (s) {
case defs::NONE:
case defs::EthernetInterface::NONE:
return std::string("none");
default:
if (s & defs::I3GBE)
if (s & defs::EthernetInterface::I3GBE)
os << "3gbe, ";
if (s & defs::I10GBE)
if (s & defs::EthernetInterface::I10GBE)
os << "10gbe, ";
auto rs = os.str();
rs.erase(rs.end() - 2);
rs.erase(rs.end() - 2, rs.end());
return rs;
}
}
@ -878,13 +878,14 @@ template <> defs::timingSourceType StringTo(const std::string &s) {
template <> defs::EthernetInterface StringTo(const std::string &s) {
std::string rs = s;
rs.erase(rs.find(','));
if (s.find(',') != std::string::npos)
rs.erase(rs.find(','));
if (rs == "none")
return defs::NONE;
return defs::EthernetInterface::NONE;
if (rs == "3gbe")
return defs::I3GBE;
return defs::EthernetInterface::I3GBE;
if (rs == "10gbe")
return defs::I10GBE;
return defs::EthernetInterface::I10GBE;
throw sls::RuntimeError("Unknown EthernetInterface type " + s);
}