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

removed store in ram from python

Browse Source
This commit is contained in:
Erik Frojdh
2020-06-18 15:36:43 +02:00
parent e7da4ae862
commit f66345d128
2 changed files with 12 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
python/slsdet/detector.py
View File

@ -732,13 +732,6 @@ class Detector(CppDetectorApi):
res = self.getMeasuredSubFramePeriod() res = self.getMeasuredSubFramePeriod()
return element_if_equal([it.total_seconds() for it in res]) return element_if_equal([it.total_seconds() for it in res])
@property
def storeinram(self):
return element_if_equal(self.getStoreInRamMode())
@storeinram.setter
def storeinram(self, value):
self.setStoreInRamMode(value)
""" """
Jungfrau specific Jungfrau specific

31
python/src/detector.cpp
View File

@ -318,6 +318,16 @@ void init_det(py::module &m) {
(void (Detector::*)(defs::dacIndex, int, int, sls::Positions)) & (void (Detector::*)(defs::dacIndex, int, int, sls::Positions)) &
Detector::setOnChipDAC, Detector::setOnChipDAC,
py::arg(), py::arg(), py::arg(), py::arg() = Positions{}) py::arg(), py::arg(), py::arg(), py::arg() = Positions{})
.def("getExternalSignalFlags",
(Result<defs::externalSignalFlag>(Detector::*)(int, sls::Positions)
const) &
Detector::getExternalSignalFlags,
py::arg(), py::arg() = Positions{})
.def("setExternalSignalFlags",
(void (Detector::*)(int, defs::externalSignalFlag,
sls::Positions)) &
Detector::setExternalSignalFlags,
py::arg(), py::arg(), py::arg() = Positions{})
.def("acquire", (void (Detector::*)()) & Detector::acquire) .def("acquire", (void (Detector::*)()) & Detector::acquire)
.def("clearAcquiringFlag", .def("clearAcquiringFlag",
(void (Detector::*)()) & Detector::clearAcquiringFlag) (void (Detector::*)()) & Detector::clearAcquiringFlag)
@ -745,14 +755,6 @@ void init_det(py::module &m) {
(void (Detector::*)(bool, sls::Positions)) & (void (Detector::*)(bool, sls::Positions)) &
Detector::setOverFlowMode, Detector::setOverFlowMode,
py::arg(), py::arg() = Positions{}) py::arg(), py::arg() = Positions{})
.def("getStoreInRamMode",
(Result<bool>(Detector::*)(sls::Positions) const) &
Detector::getStoreInRamMode,
py::arg() = Positions{})
.def("setStoreInRamMode",
(void (Detector::*)(bool, sls::Positions)) &
Detector::setStoreInRamMode,
py::arg(), py::arg() = Positions{})
.def("getBottom", .def("getBottom",
(Result<bool>(Detector::*)(sls::Positions) const) & (Result<bool>(Detector::*)(sls::Positions) const) &
Detector::getBottom, Detector::getBottom,
@ -914,16 +916,6 @@ void init_det(py::module &m) {
(Result<sls::ns>(Detector::*)(sls::Positions) const) & (Result<sls::ns>(Detector::*)(sls::Positions) const) &
Detector::getExptimeLeft, Detector::getExptimeLeft,
py::arg() = Positions{}) py::arg() = Positions{})
.def("getExternalSignalFlags",
(Result<defs::externalSignalFlag>(Detector::*)(int, sls::Positions)
const) &
Detector::getExternalSignalFlags,
py::arg(), py::arg() = Positions{})
.def("setExternalSignalFlags",
(void (Detector::*)(int, defs::externalSignalFlag,
sls::Positions)) &
Detector::setExternalSignalFlags,
py::arg(), py::arg(), py::arg() = Positions{})
.def("getNumberOfBursts", .def("getNumberOfBursts",
(Result<int64_t>(Detector::*)(sls::Positions) const) & (Result<int64_t>(Detector::*)(sls::Positions) const) &
Detector::getNumberOfBursts, Detector::getNumberOfBursts,
@ -1396,7 +1388,8 @@ void init_det(py::module &m) {
Detector::getLastClientIP, Detector::getLastClientIP,
py::arg() = Positions{}) py::arg() = Positions{})
.def("executeCommand", .def("executeCommand",
(void (Detector::*)(const std::string &, sls::Positions)) & (Result<std::string>(Detector::*)(const std::string &,
sls::Positions)) &
Detector::executeCommand, Detector::executeCommand,
py::arg(), py::arg() = Positions{}) py::arg(), py::arg() = Positions{})
.def("getNumberOfFramesFromStart", .def("getNumberOfFramesFromStart",