detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-13 13:27:14 +02:00
Code Issues Actions Packages Releases Activity

Merge branch 'pattern' of github.com:slsdetectorgroup/slsDetectorPackage into pattern

Browse Source
This commit is contained in:
maliakal_d
2020-06-23 12:10:52 +02:00
parent ae88af2a72 f592d21570
commit 39d5a7db26
2 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
python/slsdet/detector.py
View File

@ -974,14 +974,6 @@ class Detector(CppDetectorApi):
print("Set only") print("Set only")
return 0 return 0
@property
def patclkctrl(self):
return element_if_equal(self.getPatternClockControl())
@patclkctrl.setter
def patclkctrl(self, mask):
self.setPatternClockControl(mask)
# patioctrl # patioctrl
@property @property
def patioctrl(self): def patioctrl(self):

8
python/src/detector.cpp
View File

@ -1187,14 +1187,6 @@ void init_det(py::module &m) {
(void (Detector::*)(uint64_t, sls::Positions)) & (void (Detector::*)(uint64_t, sls::Positions)) &
Detector::setPatternIOControl, Detector::setPatternIOControl,
py::arg(), py::arg() = Positions{}) py::arg(), py::arg() = Positions{})
.def("getPatternClockControl",
(Result<uint64_t>(Detector::*)(sls::Positions) const) &
Detector::getPatternClockControl,
py::arg() = Positions{})
.def("setPatternClockControl",
(void (Detector::*)(uint64_t, sls::Positions)) &
Detector::setPatternClockControl,
py::arg(), py::arg() = Positions{})
.def("getPatternWord", .def("getPatternWord",
(Result<uint64_t>(Detector::*)(int, sls::Positions)) & (Result<uint64_t>(Detector::*)(int, sls::Positions)) &
Detector::getPatternWord, Detector::getPatternWord,