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

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

Browse Source
This commit is contained in:
maliakal_d 2019-04-18 15:32:25 +02:00
commit 61aa673be9
2 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
python/sls_detector/experimental.py
View File

@ -6,19 +6,4 @@ class ExperimentalDetector(multiDetectorApi):
super().__init__(0)
self.online = True
@property
def online(self):
return self._setOnline() == 1
@online.setter
def online(self, value):
self._setOnline(value)
@property
def rx_udpip(self):
return self._getReceiverUDPIP(-1)
@rx_udpip.setter
def rx_udpip(self, ip):
self._setReceiverUDPIP(ip, -1)

24
python/src/main.cpp
View File

@ -183,8 +183,10 @@ PYBIND11_MODULE(_sls_detector, m) {
.def("setRxDataStreamStatus", &Detector::setRxDataStreamStatus)
// Network stuff
.def("getReceiverHostname", &Detector::getReceiverHostname)
.def("setReceiverHostname", &Detector::setReceiverHostname)
.def("getReceiverHostname", &Detector::getReceiverHostname,
py::arg("det_id") = -1)
.def("setReceiverHostname", &Detector::setReceiverHostname,
py::arg("hostname"), py::arg("det_id") = -1)
.def("getReceiverStreamingPort", &Detector::getReceiverStreamingPort)
.def("setReceiverStreamingPort", &Detector::setReceiverStreamingPort)
.def("getReceiverUDPPort", &Detector::getReceiverUDPPort)
@ -289,9 +291,9 @@ PYBIND11_MODULE(_sls_detector, m) {
.def("setPatternWaitTime", &Detector::setPatternWaitTime,
py::arg("level"), py::arg("duration"), py::arg("det_id") = -1)
.def("getPatternWaitTime", &Detector::getPatternWaitTime,
py::arg("level"), py::arg("det_id") = -1)
py::arg("level"), py::arg("det_id") = -1)
.def("getImageSize", &Detector::getImageSize)
.def("setImageSize", &Detector::setImageSize)
@ -303,8 +305,13 @@ PYBIND11_MODULE(_sls_detector, m) {
py::class_<multiSlsDetector> multiDetectorApi(m, "multiDetectorApi");
multiDetectorApi.def(py::init<int>())
.def("acquire", &multiSlsDetector::acquire)
.def("_setOnline", &multiSlsDetector::setOnline, py::arg("flag") = -1,
py::arg("det_id") = -1)
.def_property("online",
py::cpp_function(&multiSlsDetector::setOnline, py::arg(), py::arg()=-1, py::arg("det_id")=-1),
py::cpp_function(&multiSlsDetector::setOnline, py::arg(), py::arg("flag"), py::arg("det_id")=-1)
)
// .def("_setOnline", &multiSlsDetector::setOnline, py::arg("flag") = -1,
// py::arg("det_id") = -1)
.def_property_readonly(
"hostname", py::cpp_function(&multiSlsDetector::getHostname,
@ -317,6 +324,11 @@ PYBIND11_MODULE(_sls_detector, m) {
.def_property_readonly(
"detectornumber",
py::cpp_function(&multiSlsDetector::getDetectorNumber))
.def_property("rx_udpip",
py::cpp_function(&multiSlsDetector::getReceiverUDPIP,
py::arg(), py::arg("det_id") = -1),
py::cpp_function(&multiSlsDetector::setReceiverUDPIP,
py::arg(), py::arg("ip"), py::arg("det_id") = -1) )
.def("_getReceiverUDPIP", &multiSlsDetector::getReceiverUDPIP)
.def("_setReceiverUDPIP", &multiSlsDetector::setReceiverUDPIP)
.def("getPatternLoops", &multiSlsDetector::getPatternLoops,