From 1980a7d80c1f25330f3ed6d470b0899458b1aff9 Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Wed, 28 Aug 2019 14:19:54 +0200 Subject: [PATCH] python fix --- python/sls_detector/detector.py | 9 +-------- python/src/DetectorPythonInterface.h | 12 ++++++------ python/src/main.cpp | 5 +++-- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/python/sls_detector/detector.py b/python/sls_detector/detector.py index f6481e32f..39353d5ec 100755 --- a/python/sls_detector/detector.py +++ b/python/sls_detector/detector.py @@ -36,10 +36,7 @@ class Detector: self._api.setFlippedDataX, self._api.getNumberOfDetectors, 'flippeddatax') - self._flippeddatay = DetectorProperty(self._api.getFlippedDataY, - self._api.setFlippedDataY, - self._api.getNumberOfDetectors, - 'flippeddatay') + def __len__(self): return self._api.getNumberOfDetectors() @@ -429,10 +426,6 @@ class Detector: """Flips data on x axis. Set for eiger bottom modules""" return self._flippeddatax - @property - def flipped_data_y(self): - """Flips data on y axis.""" - return self._flippeddatax @property def high_voltage(self): diff --git a/python/src/DetectorPythonInterface.h b/python/src/DetectorPythonInterface.h index 202fb2680..f55bdc13c 100755 --- a/python/src/DetectorPythonInterface.h +++ b/python/src/DetectorPythonInterface.h @@ -264,17 +264,17 @@ class DetectorPythonInterface { return det.setPatternWaitTime(level, -1, detPos); } - // bool getFlippedDataX(int i) { - // return det.getFlippedData(slsDetectorDefs::dimension::X, i); - // } + bool getFlippedDataX(int i) { + return det.getFlippedDataX(i); + } // bool getFlippedDataY(int i) { // return det.getFlippedData(slsDetectorDefs::dimension::Y, i); // } - // void setFlippedDataX(int i, bool value) { - // det.setFlippedData(slsDetectorDefs::dimension::X, value, i); - // } + void setFlippedDataX(int i, bool value) { + det.setFlippedDataX(value, i); + } // void setFlippedDataY(int i, bool value) { // det.setFlippedData(slsDetectorDefs::dimension::Y, value, i); diff --git a/python/src/main.cpp b/python/src/main.cpp index 0df93d2e2..4adb78ef1 100755 --- a/python/src/main.cpp +++ b/python/src/main.cpp @@ -161,6 +161,7 @@ PYBIND11_MODULE(_sls_detector, m) { .def("getFileName", &DetectorPythonInterface::getFileName) .def("setFileIndex", &DetectorPythonInterface::setFileIndex) .def("getFileIndex", &DetectorPythonInterface::getFileIndex) + .def("getNumberOfDetectors", &DetectorPythonInterface::getNumberOfDetectors) .def("setExposureTime", &DetectorPythonInterface::setExposureTime) .def("getExposureTime", &DetectorPythonInterface::getExposureTime) @@ -282,9 +283,9 @@ PYBIND11_MODULE(_sls_detector, m) { &DetectorPythonInterface::getReceiverCurrentFrameIndex) .def("getGapPixels", &DetectorPythonInterface::getGapPixels) .def("setGapPixels", &DetectorPythonInterface::setGapPixels) - // .def("getFlippedDataX", &DetectorPythonInterface::getFlippedDataX) + .def("getFlippedDataX", &DetectorPythonInterface::getFlippedDataX) // .def("getFlippedDataY", &DetectorPythonInterface::getFlippedDataY) - // .def("setFlippedDataX", &DetectorPythonInterface::setFlippedDataX) + .def("setFlippedDataX", &DetectorPythonInterface::setFlippedDataX) // .def("setFlippedDataY", &DetectorPythonInterface::setFlippedDataY) .def("getServerLock", &DetectorPythonInterface::getServerLock)