python funcs

This commit is contained in:
Erik Frojdh
2020-03-30 14:59:08 +02:00
parent d58eb1dc6e
commit 719157f5c3
2 changed files with 34 additions and 21 deletions

View File

@ -54,4 +54,16 @@ using this compiler
conda create -n myenv gxx_linux-64 cmake zmq conda create -n myenv gxx_linux-64 cmake zmq
conda activate myenv conda activate myenv
cmake ../slsDetectorPackage -DCMAKE_PREFIX_PATH=$CONDA_PREFIX cmake ../slsDetectorPackage -DCMAKE_PREFIX_PATH=$CONDA_PREFIX
make -j12 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

View File

@ -99,6 +99,12 @@ void init_det(py::module &m) {
void (*)(detectorData *, uint64_t, uint32_t, void *), void *)) & void (*)(detectorData *, uint64_t, uint32_t, void *), void *)) &
Detector::registerDataCallback, Detector::registerDataCallback,
py::arg(), py::arg()) py::arg(), py::arg())
.def("getGapPixelsinCallback",
(bool (Detector::*)()) & Detector::getGapPixelsinCallback)
.def("setGapPixelsinCallback",
(void (Detector::*)(const bool)) &
Detector::setGapPixelsinCallback,
py::arg())
.def("getNumberOfFrames", .def("getNumberOfFrames",
(Result<int64_t>(Detector::*)(sls::Positions)) & (Result<int64_t>(Detector::*)(sls::Positions)) &
Detector::getNumberOfFrames, Detector::getNumberOfFrames,
@ -246,6 +252,10 @@ void init_det(py::module &m) {
(Result<int>(Detector::*)(sls::Positions)) & (Result<int>(Detector::*)(sls::Positions)) &
Detector::getHighVoltage, Detector::getHighVoltage,
py::arg() = Positions{}) py::arg() = Positions{})
.def("setHighVoltage",
(void (Detector::*)(int, sls::Positions)) &
Detector::setHighVoltage,
py::arg(), py::arg() = Positions{})
.def("getPowerChip", .def("getPowerChip",
(Result<bool>(Detector::*)(sls::Positions)) & (Result<bool>(Detector::*)(sls::Positions)) &
Detector::getPowerChip, Detector::getPowerChip,
@ -254,9 +264,13 @@ void init_det(py::module &m) {
(void (Detector::*)(bool, sls::Positions)) & (void (Detector::*)(bool, sls::Positions)) &
Detector::setPowerChip, Detector::setPowerChip,
py::arg(), py::arg() = Positions{}) py::arg(), py::arg() = Positions{})
.def("setHighVoltage", .def("getImageTestMode",
(void (Detector::*)(int, sls::Positions)) & (Result<int>(Detector::*)(sls::Positions)) &
Detector::setHighVoltage, Detector::getImageTestMode,
py::arg() = Positions{})
.def("setImageTestMode",
(void (Detector::*)(const int, sls::Positions)) &
Detector::setImageTestMode,
py::arg(), py::arg() = Positions{}) py::arg(), py::arg() = Positions{})
.def("getTemperature", .def("getTemperature",
(Result<int>(Detector::*)(defs::dacIndex, sls::Positions)) & (Result<int>(Detector::*)(defs::dacIndex, sls::Positions)) &
@ -685,13 +699,6 @@ void init_det(py::module &m) {
(void (Detector::*)(const std::string &, sls::Positions)) & (void (Detector::*)(const std::string &, sls::Positions)) &
Detector::loadTrimbits, Detector::loadTrimbits,
py::arg(), py::arg() = Positions{}) py::arg(), py::arg() = Positions{})
.def("getRxAddGapPixels",
(Result<bool>(Detector::*)(sls::Positions)) &
Detector::getRxAddGapPixels,
py::arg() = Positions{})
.def("setRxAddGapPixels",
(void (Detector::*)(bool)) & Detector::setRxAddGapPixels,
py::arg())
.def("getParallelMode", .def("getParallelMode",
(Result<bool>(Detector::*)(sls::Positions)) & (Result<bool>(Detector::*)(sls::Positions)) &
Detector::getParallelMode, Detector::getParallelMode,
@ -889,14 +896,6 @@ void init_det(py::module &m) {
(void (Detector::*)(defs::externalSignalFlag, sls::Positions)) & (void (Detector::*)(defs::externalSignalFlag, sls::Positions)) &
Detector::setExternalSignalFlags, Detector::setExternalSignalFlags,
py::arg(), py::arg() = Positions{}) py::arg(), py::arg() = Positions{})
.def("getImageTestMode",
(Result<int>(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", .def("getNumberOfBursts",
(Result<int64_t>(Detector::*)(sls::Positions)) & (Result<int64_t>(Detector::*)(sls::Positions)) &
Detector::getNumberOfBursts, Detector::getNumberOfBursts,
@ -1190,11 +1189,13 @@ void init_det(py::module &m) {
Detector::setPatternBitMask, Detector::setPatternBitMask,
py::arg(), py::arg() = Positions{}) py::arg(), py::arg() = Positions{})
.def("getAdditionalJsonHeader", .def("getAdditionalJsonHeader",
(Result<std::string>(Detector::*)(sls::Positions)) & (Result<std::map<std::string, std::string>>(Detector::*)(
sls::Positions)) &
Detector::getAdditionalJsonHeader, Detector::getAdditionalJsonHeader,
py::arg() = Positions{}) py::arg() = Positions{})
.def("setAdditionalJsonHeader", .def("setAdditionalJsonHeader",
(void (Detector::*)(const std::string &, sls::Positions)) & (void (Detector::*)(const std::map<std::string, std::string> &,
sls::Positions)) &
Detector::setAdditionalJsonHeader, Detector::setAdditionalJsonHeader,
py::arg(), py::arg() = Positions{}) py::arg(), py::arg() = Positions{})
.def("getAdditionalJsonParameter", .def("getAdditionalJsonParameter",