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

added missing py file

Browse Source
This commit is contained in:
Erik Frojdh 2019-03-18 12:20:48 +01:00
parent 43d478076c
commit 98655ee7e3
5 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python/scripts/basic.py Normal file
View File

@ -0,0 +1,5 @@
from sls_detector import Eiger
from sls_detector import ExperimentalDetector
d = Eiger()
e = ExperimentalDetector()

6
python/sls_detector/detector.py
View File

@ -1053,15 +1053,15 @@ class Detector:
@property
def rx_udpmac(self):
return element_if_equal(self._api.getNetworkParameter('rx_udpmac'))
return self._api.getReceiverUDPMAC(-1)
@rx_udpmac.setter
def rx_udpmac(self, mac):
if isinstance(mac, list):
for i, m in enumerate(mac):
self._api.setNetworkParameter('rx_udpmac', m, i)
self._api.setReceiverUDPMAC(m, i)
else:
self._api.setNetworkParameter('rx_udpmac', mac, -1)
self._api.setReceiverUDPMAC(mac, -1)
@property
@error_handling

11
python/sls_detector/experimental.py Normal file
View File

@ -0,0 +1,11 @@
from _sls_detector import multiDetectorApi
class ExperimentalDetector(multiDetectorApi):
def __init__(self):
super().__init__(0)
# @rx_udpip.setter
# def rx_udpip(self, ip):
# self._setReceiverUDPIP(ip, -1)

12
python/src/Detector.h
View File

@ -93,7 +93,7 @@ class Detector {
return det.getReceiverHostname(det_id);
}
void setReceiverHostname(const std::string &hostname, int det_id = -1) {
void setReceiverHostname(std::string hostname, int det_id = -1) {
det.setReceiverHostname(hostname, det_id);
}
@ -101,10 +101,18 @@ class Detector {
return det.getReceiverUDPIP(det_id);
}
void setReceiverUDPIP(const std::string &ip, int det_id = -1) {
void setReceiverUDPIP(std::string ip, int det_id = -1) {
det.setReceiverUDPIP(ip, det_id);
}
std::string getReceiverUDPMAC(int det_id = -1){
return det.getReceiverUDPMAC(det_id);
}
void setReceiverUDPMAC(std::string mac, int det_id = -1){
det.setReceiverUDPMAC(mac, det_id);
}
void startReceiver() { det.startReceiver(); }
void stopReceiver() { det.stopReceiver(); }

2
python/src/main.cpp
View File

@ -188,6 +188,8 @@ PYBIND11_MODULE(_sls_detector, m)
.def("setReceiverUDPPort2", &Detector::setReceiverUDPPort2)
.def("setReceiverUDPIP", &Detector::setReceiverUDPIP)
.def("getReceiverUDPIP", &Detector::getReceiverUDPIP)
.def("getReceiverUDPMAC", &Detector::getReceiverUDPMAC)
.def("setReceiverUDPMAC", &Detector::setReceiverUDPMAC)
.def("getReceiverPort", &Detector::getReceiverPort)
.def("setReceiverPort", &Detector::setReceiverPort)