detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-19 08:48:51 +01:00
Code Issues Actions Packages Releases Activity

2. Ctb fname voltage (#768)

Browse Source 
* power and sense returning dac indices instead of int in Detector class

* power -> voltage, sense -> slowadc
This commit is contained in:
maliakal_d
2023-06-19 16:05:30 +02:00
committed by GitHub
parent d3d98db7e9
commit 1a338346d5
11 changed files with 236 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
python/slsdet/detector.py
View File

@@ -1803,30 +1803,30 @@ class Detector(CppDetectorApi):
self.setSignalNames(value)
@property
def powerlist(self):
def voltagelist(self):
"""
List of names for every power supply for this board. 5 power supply
List of names for every voltage for this board. 5 voltage supply
:setter: Only implemented for Chiptestboard
"""
return self.getPowerNames()
return self.getVoltageNames()
@powerlist.setter
def powerlist(self, value):
self.setPowerNames(value)
@voltagelist.setter
def voltagelist(self, value):
self.setVoltageNames(value)
@property
def senselist(self):
def slowadclist(self):
"""
List of names for every sense for this board. 8 sense
List of names for every slowadc for this board. 8 slowadc
:setter: Only implemented for Chiptestboard
"""
return self.getSenseNames()
return self.getSlowAdcNames()
@senselist.setter
def senselist(self, value):
self.setSenseNames(value)
@slowadclist.setter
def slowadclist(self, value):
self.setSlowAdcNames(value)
@property
def dacvalues(self):

40
python/src/detector.cpp
View File

@@ -1695,47 +1695,47 @@ void init_det(py::module &m) {
(std::string(Detector::*)(const int) const) &
Detector::getSignalName,
py::arg());
CppDetectorApi.def("setPowerNames",
CppDetectorApi.def("setVoltageNames",
(void (Detector::*)(const std::vector<std::string>)) &
Detector::setPowerNames,
Detector::setVoltageNames,
py::arg());
CppDetectorApi.def("getPowerNames",
CppDetectorApi.def("getVoltageNames",
(std::vector<std::string>(Detector::*)() const) &
Detector::getPowerNames);
Detector::getVoltageNames);
CppDetectorApi.def(
"getPowerIndex",
"getVoltageIndex",
(defs::dacIndex(Detector::*)(const std::string &) const) &
Detector::getPowerIndex,
Detector::getVoltageIndex,
py::arg());
CppDetectorApi.def(
"setPowerName",
"setVoltageName",
(void (Detector::*)(const defs::dacIndex, const std::string &)) &
Detector::setPowerName,
Detector::setVoltageName,
py::arg(), py::arg());
CppDetectorApi.def("getPowerName",
CppDetectorApi.def("getVoltageName",
(std::string(Detector::*)(const defs::dacIndex) const) &
Detector::getPowerName,
Detector::getVoltageName,
py::arg());
CppDetectorApi.def("setSenseNames",
CppDetectorApi.def("setSlowAdcNames",
(void (Detector::*)(const std::vector<std::string>)) &
Detector::setSenseNames,
Detector::setSlowAdcNames,
py::arg());
CppDetectorApi.def("getSenseNames",
CppDetectorApi.def("getSlowAdcNames",
(std::vector<std::string>(Detector::*)() const) &
Detector::getSenseNames);
Detector::getSlowAdcNames);
CppDetectorApi.def(
"getSenseIndex",
"getSlowAdcIndex",
(defs::dacIndex(Detector::*)(const std::string &) const) &
Detector::getSenseIndex,
Detector::getSlowAdcIndex,
py::arg());
CppDetectorApi.def(
"setSenseName",
"setSlowAdcName",
(void (Detector::*)(const defs::dacIndex, const std::string &)) &
Detector::setSenseName,
Detector::setSlowAdcName,
py::arg(), py::arg());
CppDetectorApi.def("getSenseName",
CppDetectorApi.def("getSlowAdcName",
(std::string(Detector::*)(const defs::dacIndex) const) &
Detector::getSenseName,
Detector::getSlowAdcName,
py::arg());
CppDetectorApi.def(
"setPattern",