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

Merge branch 'g2speed' of github.com:slsdetectorgroup/slsDetectorPackage into g2speed

Browse Source
This commit is contained in:
maliakal_d 2021-10-08 10:35:19 +02:00
commit e107842863
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
python/src/detector.cpp
View File

@ -254,14 +254,17 @@ void init_det(py::module &m) {
.def("getTimingModeList", .def("getTimingModeList",
(std::vector<defs::timingMode>(Detector::*)() const) & (std::vector<defs::timingMode>(Detector::*)() const) &
Detector::getTimingModeList) Detector::getTimingModeList)
.def("getSpeed", .def("getReadoutSpeed",
(Result<defs::speedLevel>(Detector::*)(sls::Positions) const) & (Result<defs::speedLevel>(Detector::*)(sls::Positions) const) &
Detector::getSpeed, Detector::getReadoutSpeed,
py::arg() = Positions{}) py::arg() = Positions{})
.def("setSpeed", .def("setReadoutSpeed",
(void (Detector::*)(defs::speedLevel, sls::Positions)) & (void (Detector::*)(defs::speedLevel, sls::Positions)) &
Detector::setSpeed, Detector::setReadoutSpeed,
py::arg(), py::arg() = Positions{}) py::arg(), py::arg() = Positions{})
.def("getReadoutSpeedList",
(std::vector<defs::speedLevel>(Detector::*)() const) &
Detector::getReadoutSpeedList)
.def("getADCPhase", .def("getADCPhase",
(Result<int>(Detector::*)(sls::Positions) const) & (Result<int>(Detector::*)(sls::Positions) const) &
Detector::getADCPhase, Detector::getADCPhase,

13
python/src/enums.cpp
View File

@ -250,6 +250,8 @@ void init_enums(py::module &m) {
.value("FULL_SPEED", slsDetectorDefs::speedLevel::FULL_SPEED) .value("FULL_SPEED", slsDetectorDefs::speedLevel::FULL_SPEED)
.value("HALF_SPEED", slsDetectorDefs::speedLevel::HALF_SPEED) .value("HALF_SPEED", slsDetectorDefs::speedLevel::HALF_SPEED)
.value("QUARTER_SPEED", slsDetectorDefs::speedLevel::QUARTER_SPEED) .value("QUARTER_SPEED", slsDetectorDefs::speedLevel::QUARTER_SPEED)
.value("G_108MHZ", slsDetectorDefs::speedLevel::G_108MHZ)
.value("G_144MHZ", slsDetectorDefs::speedLevel::G_144MHZ)
.export_values(); .export_values();
py::enum_<slsDetectorDefs::burstMode>(Defs, "burstMode") py::enum_<slsDetectorDefs::burstMode>(Defs, "burstMode")
@ -269,8 +271,7 @@ void init_enums(py::module &m) {
slsDetectorDefs::timingSourceType::TIMING_EXTERNAL) slsDetectorDefs::timingSourceType::TIMING_EXTERNAL)
.export_values(); .export_values();
py::enum_<slsDetectorDefs::M3_GainCaps>(Defs, "M3_GainCaps", py::enum_<slsDetectorDefs::M3_GainCaps>(Defs, "M3_GainCaps")
py::arithmetic())
.value("M3_C10pre", slsDetectorDefs::M3_GainCaps::M3_C10pre) .value("M3_C10pre", slsDetectorDefs::M3_GainCaps::M3_C10pre)
.value("M3_C15sh", slsDetectorDefs::M3_GainCaps::M3_C15sh) .value("M3_C15sh", slsDetectorDefs::M3_GainCaps::M3_C15sh)
.value("M3_C30sh", slsDetectorDefs::M3_GainCaps::M3_C30sh) .value("M3_C30sh", slsDetectorDefs::M3_GainCaps::M3_C30sh)
@ -287,10 +288,12 @@ void init_enums(py::module &m) {
.export_values(); .export_values();
py::enum_<slsDetectorDefs::streamingInterface>(Defs, "streamingInterface", py::enum_<slsDetectorDefs::streamingInterface>(Defs, "streamingInterface",
py::arithmetic()) py::arithmetic())
.value("NONE", slsDetectorDefs::streamingInterface::NONE) .value("NONE", slsDetectorDefs::streamingInterface::NONE)
.value("LOW_LATENCY_LINK", slsDetectorDefs::streamingInterface::LOW_LATENCY_LINK) .value("LOW_LATENCY_LINK",
.value("ETHERNET_10GB", slsDetectorDefs::streamingInterface::ETHERNET_10GB) slsDetectorDefs::streamingInterface::LOW_LATENCY_LINK)
.value("ETHERNET_10GB",
slsDetectorDefs::streamingInterface::ETHERNET_10GB)
.value("ALL", slsDetectorDefs::streamingInterface::ALL) .value("ALL", slsDetectorDefs::streamingInterface::ALL)
.export_values() .export_values()
.def("__or__", .def("__or__",

BIN
slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
View File

Binary file not shown.

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

@ -4,10 +4,10 @@
#define APICTB 0x211007 #define APICTB 0x211007
#define APIGOTTHARD 0x211007 #define APIGOTTHARD 0x211007
#define APIGOTTHARD2 0x211007 #define APIGOTTHARD2 0x211007
#define APIJUNGFRAU 0x211007
#define APIMYTHEN3 0x211007 #define APIMYTHEN3 0x211007
#define APIMOENCH 0x211005 #define APIMOENCH 0x211005
#define APIEIGER 0x211007 #define APIEIGER 0x211007
#define APILIB 0x211007 #define APILIB 0x211007
#define APIRECEIVER 0x211007 #define APIRECEIVER 0x211007
#define APIGUI 0x210819 #define APIGUI 0x210819
#define APIJUNGFRAU 0x211008