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

removed M3 ops and fixed comment

Browse Source
This commit is contained in:
Erik Frojdh 2022-02-02 19:27:44 +01:00
parent 6c662b1370
commit 2c842afbf4
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/src/enums.cpp
View File

@ -281,9 +281,7 @@ void init_enums(py::module &m) {
.value("M3_C50sh", slsDetectorDefs::M3_GainCaps::M3_C50sh) .value("M3_C50sh", slsDetectorDefs::M3_GainCaps::M3_C50sh)
.value("M3_C225ACsh", slsDetectorDefs::M3_GainCaps::M3_C225ACsh) .value("M3_C225ACsh", slsDetectorDefs::M3_GainCaps::M3_C225ACsh)
.value("M3_C15pre", slsDetectorDefs::M3_GainCaps::M3_C15pre) .value("M3_C15pre", slsDetectorDefs::M3_GainCaps::M3_C15pre)
.export_values() .export_values();
.def(py::self | slsDetectorDefs::M3_GainCaps())
.def(py::self & slsDetectorDefs::M3_GainCaps());
py::enum_<slsDetectorDefs::portPosition>(Defs, "portPosition") py::enum_<slsDetectorDefs::portPosition>(Defs, "portPosition")
.value("LEFT", slsDetectorDefs::portPosition::LEFT) .value("LEFT", slsDetectorDefs::portPosition::LEFT)

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

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