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

more const more python

Browse Source
This commit is contained in:
Erik Frojdh
2019-03-18 17:38:44 +01:00
parent 98655ee7e3
commit 43012e4f28
9 changed files with 65 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
python/src/Detector.h
View File

@ -130,23 +130,6 @@ class Detector {
return det.checkOnline();
}
void clearErrorMask() {
det.clearAllErrorMask();
}
int64_t getErrorMask() {
return det.getErrorMask();
}
void setErrorMask(const int64_t i) {
det.setErrorMask(i);
}
std::string getErrorMessage() {
//tmp would hold the number of critical errors, is and should this be used?
int tmp = 0;
return det.getErrorMessage(tmp);
}
bool getReceiverOnline() {
return det.setReceiverOnline();
}
@ -253,8 +236,8 @@ class Detector {
int64_t getClientVersion() { return det.getId(slsDetectorDefs::THIS_SOFTWARE_VERSION); }
int64_t getReceiverVersion() { return det.getId(slsDetectorDefs::RECEIVER_VERSION); }
int getDetectorNumber(int i) {
return det.getId(slsDetectorDefs::DETECTOR_SERIAL_NUMBER, i);
std::vector<int64_t> getDetectorNumber() {
return det.getDetectorNumber();
}
int getReadoutClockSpeed() {

13
python/src/main.cpp
View File

@ -239,12 +239,6 @@ PYBIND11_MODULE(_sls_detector, m)
.def("getReceiverCurrentFrameIndex", &Detector::getReceiverCurrentFrameIndex)
.def("getGapPixels", &Detector::getGapPixels)
.def("setGapPixels", &Detector::setGapPixels)
.def("clearErrorMask", &Detector::clearErrorMask)
.def("getErrorMask", &Detector::getErrorMask)
.def("setErrorMask", &Detector::setErrorMask)
.def("getErrorMessage", &Detector::getErrorMessage)
.def("getFlippedDataX", &Detector::getFlippedDataX)
.def("getFlippedDataY", &Detector::getFlippedDataY)
.def("setFlippedDataX", &Detector::setFlippedDataX)
@ -284,9 +278,10 @@ py::class_<multiSlsDetector> multiDetectorApi(m, "multiDetectorApi");
py::cpp_function(&multiSlsDetector::setAcquiringFlag))
.def_property_readonly("rx_tcpport",
py::cpp_function(&multiSlsDetector::getReceiverPort))
// .def_property_readonly("rx_udpip",
// py::cpp_function(&multiSlsDetector::getReceiverUDPIP), py::arg("det_id")=1)
// .def("_setReceiverUDPIP", &multiSlsDetector::setReceiverUDPIP)
.def_property_readonly("detectornumber",
py::cpp_function(&multiSlsDetector::getDetectorNumber))
.def("_getReceiverUDPIP", &multiSlsDetector::getReceiverUDPIP)
.def("_setReceiverUDPIP", &multiSlsDetector::setReceiverUDPIP)
;