diff --git a/docs/src/installation.rst b/docs/src/installation.rst index 57f624dc7..868b7aef2 100644 --- a/docs/src/installation.rst +++ b/docs/src/installation.rst @@ -54,4 +54,16 @@ using this compiler conda create -n myenv gxx_linux-64 cmake zmq conda activate myenv cmake ../slsDetectorPackage -DCMAKE_PREFIX_PATH=$CONDA_PREFIX - make -j12 \ No newline at end of file + make -j12 + + +Build this documentation +------------------------------- + +The documentation for the slsDetectorPackage is build using a combination +of Doxygen, Sphinx and Breathe. The easiest way to install the dependencies +is to use conda + +.. code-block:: bash + + conda create -n myenv python sphinx sphinx_rtd_theme \ No newline at end of file diff --git a/python/src/detector.cpp b/python/src/detector.cpp index d14258e8b..09a69668d 100644 --- a/python/src/detector.cpp +++ b/python/src/detector.cpp @@ -99,6 +99,12 @@ void init_det(py::module &m) { void (*)(detectorData *, uint64_t, uint32_t, void *), void *)) & Detector::registerDataCallback, py::arg(), py::arg()) + .def("getGapPixelsinCallback", + (bool (Detector::*)()) & Detector::getGapPixelsinCallback) + .def("setGapPixelsinCallback", + (void (Detector::*)(const bool)) & + Detector::setGapPixelsinCallback, + py::arg()) .def("getNumberOfFrames", (Result(Detector::*)(sls::Positions)) & Detector::getNumberOfFrames, @@ -246,6 +252,10 @@ void init_det(py::module &m) { (Result(Detector::*)(sls::Positions)) & Detector::getHighVoltage, py::arg() = Positions{}) + .def("setHighVoltage", + (void (Detector::*)(int, sls::Positions)) & + Detector::setHighVoltage, + py::arg(), py::arg() = Positions{}) .def("getPowerChip", (Result(Detector::*)(sls::Positions)) & Detector::getPowerChip, @@ -254,9 +264,13 @@ void init_det(py::module &m) { (void (Detector::*)(bool, sls::Positions)) & Detector::setPowerChip, py::arg(), py::arg() = Positions{}) - .def("setHighVoltage", - (void (Detector::*)(int, sls::Positions)) & - Detector::setHighVoltage, + .def("getImageTestMode", + (Result(Detector::*)(sls::Positions)) & + Detector::getImageTestMode, + py::arg() = Positions{}) + .def("setImageTestMode", + (void (Detector::*)(const int, sls::Positions)) & + Detector::setImageTestMode, py::arg(), py::arg() = Positions{}) .def("getTemperature", (Result(Detector::*)(defs::dacIndex, sls::Positions)) & @@ -685,13 +699,6 @@ void init_det(py::module &m) { (void (Detector::*)(const std::string &, sls::Positions)) & Detector::loadTrimbits, py::arg(), py::arg() = Positions{}) - .def("getRxAddGapPixels", - (Result(Detector::*)(sls::Positions)) & - Detector::getRxAddGapPixels, - py::arg() = Positions{}) - .def("setRxAddGapPixels", - (void (Detector::*)(bool)) & Detector::setRxAddGapPixels, - py::arg()) .def("getParallelMode", (Result(Detector::*)(sls::Positions)) & Detector::getParallelMode, @@ -889,14 +896,6 @@ void init_det(py::module &m) { (void (Detector::*)(defs::externalSignalFlag, sls::Positions)) & Detector::setExternalSignalFlags, py::arg(), py::arg() = Positions{}) - .def("getImageTestMode", - (Result(Detector::*)(sls::Positions)) & - Detector::getImageTestMode, - py::arg() = Positions{}) - .def("setImageTestMode", - (void (Detector::*)(const int, sls::Positions)) & - Detector::setImageTestMode, - py::arg(), py::arg() = Positions{}) .def("getNumberOfBursts", (Result(Detector::*)(sls::Positions)) & Detector::getNumberOfBursts, @@ -1190,11 +1189,13 @@ void init_det(py::module &m) { Detector::setPatternBitMask, py::arg(), py::arg() = Positions{}) .def("getAdditionalJsonHeader", - (Result(Detector::*)(sls::Positions)) & + (Result>(Detector::*)( + sls::Positions)) & Detector::getAdditionalJsonHeader, py::arg() = Positions{}) .def("setAdditionalJsonHeader", - (void (Detector::*)(const std::string &, sls::Positions)) & + (void (Detector::*)(const std::map &, + sls::Positions)) & Detector::setAdditionalJsonHeader, py::arg(), py::arg() = Positions{}) .def("getAdditionalJsonParameter",