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

filter resistor in

Browse Source
This commit is contained in:
maliakal_d
2021-08-05 16:56:53 +02:00
parent 9312ef0d65
commit 86126c7e27
16 changed files with 156 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
python/slsdet/detector.py
View File

@ -2238,17 +2238,18 @@ class Detector(CppDetectorApi):
@property
@element
def filter(self):
"""[Gotthard2] Set filter resistor.
def filterresistor(self):
"""[Gotthard2][Jungfrau] Set filter resistor.
Note
----
Default is 0. Options: 0-3.
[Gotthard2] Default is 0. Options: 0-3.
[Jungfrau] Default is 1. Options: 0-1.
"""
return self.getFilter()
return self.getFilterResistor()
@filter.setter
def filter(self, value):
ut.set_using_dict(self.setFilter, value)
ut.set_using_dict(self.setFilterResistor, value)
@property
def maxclkphaseshift(self):

8
python/src/detector.cpp
View File

@ -1097,12 +1097,12 @@ void init_det(py::module &m) {
.def("setCDSGain",
(void (Detector::*)(bool, sls::Positions)) & Detector::setCDSGain,
py::arg(), py::arg() = Positions{})
.def("getFilter",
.def("getFilterResistor",
(Result<int>(Detector::*)(sls::Positions) const) &
Detector::getFilter,
Detector::getFilterResistor,
py::arg() = Positions{})
.def("setFilter",
(void (Detector::*)(int, sls::Positions)) & Detector::setFilter,
.def("setFilterResistor",
(void (Detector::*)(int, sls::Positions)) & Detector::setFilterResistor,
py::arg(), py::arg() = Positions{})
.def("getCurrentSource",
(Result<bool>(Detector::*)(sls::Positions) const) &