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

python fix

Browse Source
This commit is contained in:
Erik Frojdh 2019-08-28 14:19:54 +02:00
parent 014b8cf9a6
commit 1980a7d80c
3 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
python/sls_detector/detector.py
View File

@ -36,10 +36,7 @@ class Detector:
self._api.setFlippedDataX, self._api.setFlippedDataX,
self._api.getNumberOfDetectors, self._api.getNumberOfDetectors,
'flippeddatax') 'flippeddatax')
self._flippeddatay = DetectorProperty(self._api.getFlippedDataY,
self._api.setFlippedDataY,
self._api.getNumberOfDetectors,
'flippeddatay')
def __len__(self): def __len__(self):
return self._api.getNumberOfDetectors() return self._api.getNumberOfDetectors()
@ -429,10 +426,6 @@ class Detector:
"""Flips data on x axis. Set for eiger bottom modules""" """Flips data on x axis. Set for eiger bottom modules"""
return self._flippeddatax return self._flippeddatax
@property
def flipped_data_y(self):
"""Flips data on y axis."""
return self._flippeddatax
@property @property
def high_voltage(self): def high_voltage(self):

12
python/src/DetectorPythonInterface.h
View File

@ -264,17 +264,17 @@ class DetectorPythonInterface {
return det.setPatternWaitTime(level, -1, detPos); return det.setPatternWaitTime(level, -1, detPos);
} }
// bool getFlippedDataX(int i) { bool getFlippedDataX(int i) {
// return det.getFlippedData(slsDetectorDefs::dimension::X, i); return det.getFlippedDataX(i);
// } }
// bool getFlippedDataY(int i) { // bool getFlippedDataY(int i) {
// return det.getFlippedData(slsDetectorDefs::dimension::Y, i); // return det.getFlippedData(slsDetectorDefs::dimension::Y, i);
// } // }
// void setFlippedDataX(int i, bool value) { void setFlippedDataX(int i, bool value) {
// det.setFlippedData(slsDetectorDefs::dimension::X, value, i); det.setFlippedDataX(value, i);
// } }
// void setFlippedDataY(int i, bool value) { // void setFlippedDataY(int i, bool value) {
// det.setFlippedData(slsDetectorDefs::dimension::Y, value, i); // det.setFlippedData(slsDetectorDefs::dimension::Y, value, i);

5
python/src/main.cpp
View File

@ -161,6 +161,7 @@ PYBIND11_MODULE(_sls_detector, m) {
.def("getFileName", &DetectorPythonInterface::getFileName) .def("getFileName", &DetectorPythonInterface::getFileName)
.def("setFileIndex", &DetectorPythonInterface::setFileIndex) .def("setFileIndex", &DetectorPythonInterface::setFileIndex)
.def("getFileIndex", &DetectorPythonInterface::getFileIndex) .def("getFileIndex", &DetectorPythonInterface::getFileIndex)
.def("getNumberOfDetectors", &DetectorPythonInterface::getNumberOfDetectors)
.def("setExposureTime", &DetectorPythonInterface::setExposureTime) .def("setExposureTime", &DetectorPythonInterface::setExposureTime)
.def("getExposureTime", &DetectorPythonInterface::getExposureTime) .def("getExposureTime", &DetectorPythonInterface::getExposureTime)
@ -282,9 +283,9 @@ PYBIND11_MODULE(_sls_detector, m) {
&DetectorPythonInterface::getReceiverCurrentFrameIndex) &DetectorPythonInterface::getReceiverCurrentFrameIndex)
.def("getGapPixels", &DetectorPythonInterface::getGapPixels) .def("getGapPixels", &DetectorPythonInterface::getGapPixels)
.def("setGapPixels", &DetectorPythonInterface::setGapPixels) .def("setGapPixels", &DetectorPythonInterface::setGapPixels)
// .def("getFlippedDataX", &DetectorPythonInterface::getFlippedDataX) .def("getFlippedDataX", &DetectorPythonInterface::getFlippedDataX)
// .def("getFlippedDataY", &DetectorPythonInterface::getFlippedDataY) // .def("getFlippedDataY", &DetectorPythonInterface::getFlippedDataY)
// .def("setFlippedDataX", &DetectorPythonInterface::setFlippedDataX) .def("setFlippedDataX", &DetectorPythonInterface::setFlippedDataX)
// .def("setFlippedDataY", &DetectorPythonInterface::setFlippedDataY) // .def("setFlippedDataY", &DetectorPythonInterface::setFlippedDataY)
.def("getServerLock", &DetectorPythonInterface::getServerLock) .def("getServerLock", &DetectorPythonInterface::getServerLock)