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

python wrapper

Browse Source
This commit is contained in:
Erik Frojdh 2020-11-26 14:44:39 +01:00
parent baff0518bb
commit 8ca1d9c50c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/src/enums.cpp
View File

@ -21,8 +21,8 @@ void init_enums(py::module &m) {
m, "patternParameters"); m, "patternParameters");
using pat = slsDetectorDefs::patternParameters; using pat = slsDetectorDefs::patternParameters;
PYBIND11_NUMPY_DTYPE(pat, word, patioctrl, patlimits, patloop, patnloop, PYBIND11_NUMPY_DTYPE(pat, word, ioctrl, limits, loop, nloop, wait,
patwait, patwaittime); waittime);
patternParameters.def(py::init()); patternParameters.def(py::init());
patternParameters.def("numpy_view", [](py::object &obj) { patternParameters.def("numpy_view", [](py::object &obj) {

4
python/src/enums_in.cpp
View File

@ -18,8 +18,8 @@ void init_enums(py::module &m) {
m, "patternParameters"); m, "patternParameters");
using pat = slsDetectorDefs::patternParameters; using pat = slsDetectorDefs::patternParameters;
PYBIND11_NUMPY_DTYPE(pat, word, patioctrl, patlimits, patloop, patnloop, PYBIND11_NUMPY_DTYPE(pat, word, ioctrl, limits, loop, nloop,
patwait, patwaittime); wait, waittime);
patternParameters.def(py::init()); patternParameters.def(py::init());
patternParameters.def("numpy_view", [](py::object &obj) { patternParameters.def("numpy_view", [](py::object &obj) {

2
slsDetectorSoftware/src/Detector.cpp
View File

@ -1756,7 +1756,7 @@ void Detector::setLEDEnable(bool enable, Positions pos) {
void Detector::savePattern(const std::string &fname) { void Detector::savePattern(const std::string &fname) {
auto t = pimpl->Parallel(&Module::getPattern, {}); auto t = pimpl->Parallel(&Module::getPattern, {});
// auto pat = t.tsquash("Inconsistent pattern parameters between modules"); // auto pat = t.tsquash("Inconsistent pattern parameters between modules");
auto pat = t[0]; auto pat = std::move(t[0]);
// pat->save(fname); // pat->save(fname);
} // namespace sls } // namespace sls