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

fix

Browse Source
This commit is contained in:
Erik Frojdh
2019-04-18 15:40:20 +02:00
parent 61aa673be9
commit 833ca071c4
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
python/src/Detector.h
View File

@ -250,7 +250,7 @@ class Detector {
} }
std::array<uint64_t, 3> getPatternLoops(uint64_t level, int detPos) { std::array<int, 3> getPatternLoops(int level, int detPos) {
return det.getPatternLoops(level, detPos); return det.getPatternLoops(level, detPos);
} }

15
python/src/main.cpp
View File

@ -300,6 +300,8 @@ PYBIND11_MODULE(_sls_detector, m) {
.def("getNumberOfDetectors", &Detector::getNumberOfDetectors) .def("getNumberOfDetectors", &Detector::getNumberOfDetectors)
.def("getDetectorGeometry", &Detector::getDetectorGeometry); .def("getDetectorGeometry", &Detector::getDetectorGeometry);
// Experimental API to use the multi directly and inherit from to reduce // Experimental API to use the multi directly and inherit from to reduce
// code duplication need to investigate how to handle documentation // code duplication need to investigate how to handle documentation
py::class_<multiSlsDetector> multiDetectorApi(m, "multiDetectorApi"); py::class_<multiSlsDetector> multiDetectorApi(m, "multiDetectorApi");
@ -307,10 +309,12 @@ PYBIND11_MODULE(_sls_detector, m) {
.def("acquire", &multiSlsDetector::acquire) .def("acquire", &multiSlsDetector::acquire)
.def_property("online", .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::cpp_function(&multiSlsDetector::setOnline, py::arg(), py::arg("flag"), py::arg("det_id")=-1) py::arg() = -1, py::arg("det_id") = -1),
) py::cpp_function(&multiSlsDetector::setOnline, py::arg(),
// .def("_setOnline", &multiSlsDetector::setOnline, py::arg("flag") = -1, py::arg("flag"), py::arg("det_id") = -1))
// .def("_setOnline", &multiSlsDetector::setOnline, py::arg("flag") =
// -1,
// py::arg("det_id") = -1) // py::arg("det_id") = -1)
.def_property_readonly( .def_property_readonly(
@ -328,7 +332,8 @@ PYBIND11_MODULE(_sls_detector, m) {
py::cpp_function(&multiSlsDetector::getReceiverUDPIP, py::cpp_function(&multiSlsDetector::getReceiverUDPIP,
py::arg(), py::arg("det_id") = -1), py::arg(), py::arg("det_id") = -1),
py::cpp_function(&multiSlsDetector::setReceiverUDPIP, py::cpp_function(&multiSlsDetector::setReceiverUDPIP,
py::arg(), py::arg("ip"), py::arg("det_id") = -1) ) py::arg(), py::arg("ip"),
py::arg("det_id") = -1))
.def("_getReceiverUDPIP", &multiSlsDetector::getReceiverUDPIP) .def("_getReceiverUDPIP", &multiSlsDetector::getReceiverUDPIP)
.def("_setReceiverUDPIP", &multiSlsDetector::setReceiverUDPIP) .def("_setReceiverUDPIP", &multiSlsDetector::setReceiverUDPIP)
.def("getPatternLoops", &multiSlsDetector::getPatternLoops, .def("getPatternLoops", &multiSlsDetector::getPatternLoops,