diff --git a/python/src/detector.cpp b/python/src/detector.cpp index b68758577..0141bcd8d 100644 --- a/python/src/detector.cpp +++ b/python/src/detector.cpp @@ -254,14 +254,17 @@ void init_det(py::module &m) { .def("getTimingModeList", (std::vector(Detector::*)() const) & Detector::getTimingModeList) - .def("getSpeed", + .def("getReadoutSpeed", (Result(Detector::*)(sls::Positions) const) & - Detector::getSpeed, + Detector::getReadoutSpeed, py::arg() = Positions{}) - .def("setSpeed", + .def("setReadoutSpeed", (void (Detector::*)(defs::speedLevel, sls::Positions)) & - Detector::setSpeed, + Detector::setReadoutSpeed, py::arg(), py::arg() = Positions{}) + .def("getReadoutSpeedList", + (std::vector(Detector::*)() const) & + Detector::getReadoutSpeedList) .def("getADCPhase", (Result(Detector::*)(sls::Positions) const) & Detector::getADCPhase, diff --git a/python/src/enums.cpp b/python/src/enums.cpp index 96db8bca9..8cbaa52da 100644 --- a/python/src/enums.cpp +++ b/python/src/enums.cpp @@ -250,6 +250,8 @@ void init_enums(py::module &m) { .value("FULL_SPEED", slsDetectorDefs::speedLevel::FULL_SPEED) .value("HALF_SPEED", slsDetectorDefs::speedLevel::HALF_SPEED) .value("QUARTER_SPEED", slsDetectorDefs::speedLevel::QUARTER_SPEED) + .value("G_108MHZ", slsDetectorDefs::speedLevel::G_108MHZ) + .value("G_144MHZ", slsDetectorDefs::speedLevel::G_144MHZ) .export_values(); py::enum_(Defs, "burstMode") @@ -269,8 +271,7 @@ void init_enums(py::module &m) { slsDetectorDefs::timingSourceType::TIMING_EXTERNAL) .export_values(); - py::enum_(Defs, "M3_GainCaps", - py::arithmetic()) + py::enum_(Defs, "M3_GainCaps") .value("M3_C10pre", slsDetectorDefs::M3_GainCaps::M3_C10pre) .value("M3_C15sh", slsDetectorDefs::M3_GainCaps::M3_C15sh) .value("M3_C30sh", slsDetectorDefs::M3_GainCaps::M3_C30sh) @@ -287,10 +288,12 @@ void init_enums(py::module &m) { .export_values(); py::enum_(Defs, "streamingInterface", - py::arithmetic()) + py::arithmetic()) .value("NONE", slsDetectorDefs::streamingInterface::NONE) - .value("LOW_LATENCY_LINK", slsDetectorDefs::streamingInterface::LOW_LATENCY_LINK) - .value("ETHERNET_10GB", slsDetectorDefs::streamingInterface::ETHERNET_10GB) + .value("LOW_LATENCY_LINK", + slsDetectorDefs::streamingInterface::LOW_LATENCY_LINK) + .value("ETHERNET_10GB", + slsDetectorDefs::streamingInterface::ETHERNET_10GB) .value("ALL", slsDetectorDefs::streamingInterface::ALL) .export_values() .def("__or__", diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index ca3ed35af..40baea53f 100755 Binary files a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer and b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer differ diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index 19c4db3e7..8193529bb 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -4,10 +4,10 @@ #define APICTB 0x211007 #define APIGOTTHARD 0x211007 #define APIGOTTHARD2 0x211007 -#define APIJUNGFRAU 0x211007 #define APIMYTHEN3 0x211007 #define APIMOENCH 0x211005 #define APIEIGER 0x211007 #define APILIB 0x211007 #define APIRECEIVER 0x211007 #define APIGUI 0x210819 +#define APIJUNGFRAU 0x211008