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

fixed python

Browse Source
This commit is contained in:
Erik Frojdh 2019-04-18 15:57:59 +02:00
parent e3859c3097
commit 83c2775d6c
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
python/sls_detector/detector.py
View File

@ -1480,15 +1480,15 @@ class Detector:
@property @property
def patioctrl(self): def patioctrl(self):
return self._api.getPatternWord(-1) return self._api.setPatternIOControl(np.uint64(-1))
@patioctrl.setter @patioctrl.setter
def patioctrl(self, word): def patioctrl(self, word):
self._api.setPatternWord(-1, np.uint64(word)) self._api.setPatternIOControl(np.uint64(word))
@property @property
def patlimits(self): def patlimits(self):
return self._api.getPatternLoops(np.uint64(-1),-1)[0:2] return self._api.getPatternLoops(-1,-1)[0:2]
@patlimits.setter @patlimits.setter
def patlimits(self, value): def patlimits(self, value):
@ -1506,11 +1506,11 @@ class Detector:
@property @property
def patclkctrl(self): def patclkctrl(self):
return self._api.getPatternWord(-2) return self._api.setPatternClockControl(np.uint64(-1))
@patclkctrl.setter @patclkctrl.setter
def patclkctrl(self, value): def patclkctrl(self, value):
self._api.setPatternWord(-2, value) self._api.setPatternClockControl(value)
def free_shared_memory(multi_id=0): def free_shared_memory(multi_id=0):

8
python/src/Detector.h
View File

@ -262,6 +262,14 @@ class Detector {
return det.setPatternWord(addr, -1, detPos); return det.setPatternWord(addr, -1, detPos);
} }
uint64_t setPatternIOControl(uint64_t word, int detPos){
return det.setPatternIOControl(word, detPos);
}
uint64_t setPatternClockControl(uint64_t word, int detPos){
return det.setPatternClockControl(word, detPos);
}
void setPatternWaitAddr(int level, int addr, int detPos){ void setPatternWaitAddr(int level, int addr, int detPos){
det.setPatternWaitAddr(level, addr, detPos); det.setPatternWaitAddr(level, addr, detPos);
} }

3
python/src/main.cpp
View File

@ -284,6 +284,9 @@ PYBIND11_MODULE(_sls_detector, m) {
.def("getPatternWord", &Detector::getPatternWord, py::arg("addr"), .def("getPatternWord", &Detector::getPatternWord, py::arg("addr"),
py::arg("det_id") = -1) py::arg("det_id") = -1)
.def("setPatternIOControl", &Detector::setPatternIOControl, py::arg("word"), py::arg("det_id") = -1)
.def("setPatternClockControl", &Detector::setPatternClockControl, py::arg("word"), py::arg("det_id") = -1)
.def("setPatternWaitAddr", &Detector::setPatternWaitAddr, .def("setPatternWaitAddr", &Detector::setPatternWaitAddr,
py::arg("level"), py::arg("addr"), py::arg("det_id") = -1) py::arg("level"), py::arg("addr"), py::arg("det_id") = -1)
.def("getPatternWaitAddr", &Detector::getPatternWaitAddr, .def("getPatternWaitAddr", &Detector::getPatternWaitAddr,