From a31b741f7bf7ec7ed25d660db085eb7a59400450 Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Fri, 30 Jul 2021 10:08:33 +0200 Subject: [PATCH] added python --- .clang-tidy | 3 ++- python/src/detector.cpp | 33 ++++++++++++++++++++++++++------- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/.clang-tidy b/.clang-tidy index 6e94d11e4..be4381b08 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -18,7 +18,8 @@ Checks: '*, -google-readability-todo, -google-readability-braces-around-statements, -modernize-use-trailing-return-type, - -readability-isolate-declaration' + -readability-isolate-declaration, + -llvmlibc-*' HeaderFilterRegex: \.h AnalyzeTemporaryDtors: false diff --git a/python/src/detector.cpp b/python/src/detector.cpp index 9e558a235..e265814c7 100644 --- a/python/src/detector.cpp +++ b/python/src/detector.cpp @@ -354,9 +354,28 @@ void init_det(py::module &m) { py::arg(), py::arg() = Positions{}) .def("getDacList", (std::vector(Detector::*)() const) & Detector::getDacList) - .def("setDefaultDacs", - (void (Detector::*)(sls::Positions)) & Detector::setDefaultDacs, - py::arg() = Positions{}) + .def("getDefaultDac", + (Result(Detector::*)(defs::dacIndex, sls::Positions)) & + Detector::getDefaultDac, + py::arg(), py::arg() = Positions{}) + .def("setDefaultDac", + (void (Detector::*)(defs::dacIndex, int, sls::Positions)) & + Detector::setDefaultDac, + py::arg(), py::arg(), py::arg() = Positions{}) + .def("getDefaultDac", + (Result(Detector::*)(defs::dacIndex, defs::detectorSettings, + sls::Positions)) & + Detector::getDefaultDac, + py::arg(), py::arg(), py::arg() = Positions{}) + .def("setDefaultDac", + (void (Detector::*)(defs::dacIndex, int, defs::detectorSettings, + sls::Positions)) & + Detector::setDefaultDac, + py::arg(), py::arg(), py::arg(), py::arg() = Positions{}) + .def("resetToDefaultDacs", + (void (Detector::*)(const bool, sls::Positions)) & + Detector::resetToDefaultDacs, + py::arg(), py::arg() = Positions{}) .def("getDAC", (Result(Detector::*)(defs::dacIndex, bool, sls::Positions) const) & @@ -923,6 +942,10 @@ void init_det(py::module &m) { sls::Positions)) & Detector::setDataStream, py::arg(), py::arg(), py::arg() = Positions{}) + .def("getChipVersion", + (Result(Detector::*)(sls::Positions) const) & + Detector::getChipVersion, + py::arg() = Positions{}) .def("getThresholdTemperature", (Result(Detector::*)(sls::Positions) const) & Detector::getThresholdTemperature, @@ -947,10 +970,6 @@ void init_det(py::module &m) { (void (Detector::*)(sls::Positions)) & Detector::resetTemperatureEvent, py::arg() = Positions{}) - .def("getChipVersion", - (Result(Detector::*)(sls::Positions) const) & - Detector::getChipVersion, - py::arg() = Positions{}) .def("getAutoCompDisable", (Result(Detector::*)(sls::Positions) const) & Detector::getAutoCompDisable,