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

python compiles

Browse Source
This commit is contained in:
Erik Frojdh 2019-09-30 15:00:03 +02:00
parent ca054626e6
commit 7242a6901a
3 changed files with 44 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
python/src/DetectorPythonInterface.h
View File

@ -72,21 +72,21 @@ class DetectorPythonInterface {
det.setReceiverHostname(hostname, det_id); det.setReceiverHostname(hostname, det_id);
} }
std::string getReceiverUDPIP(int det_id = -1) const { // std::string getReceiverUDPIP(int det_id = -1) const {
return det.getReceiverUDPIP(det_id); // return det.getReceiverUDPIP(det_id);
} // }
void setReceiverUDPIP(std::string ip, int det_id = -1) { // void setReceiverUDPIP(std::string ip, int det_id = -1) {
det.setReceiverUDPIP(ip, det_id); // det.setReceiverUDPIP(ip, det_id);
} // }
std::string getReceiverUDPMAC(int det_id = -1) { // std::string getReceiverUDPMAC(int det_id = -1) {
return det.getReceiverUDPMAC(det_id); // return det.getReceiverUDPMAC(det_id);
} // }
void setReceiverUDPMAC(std::string mac, int det_id = -1) { // void setReceiverUDPMAC(std::string mac, int det_id = -1) {
det.setReceiverUDPMAC(mac, det_id); // det.setReceiverUDPMAC(mac, det_id);
} // }
void startReceiver() { det.startReceiver(); } void startReceiver() { det.startReceiver(); }
void stopReceiver() { det.stopReceiver(); } void stopReceiver() { det.stopReceiver(); }
@ -570,45 +570,31 @@ class DetectorPythonInterface {
det.setReceiverDataStreamingOutPort(value, det_id); det.setReceiverDataStreamingOutPort(value, det_id);
} }
std::vector<int> getReceiverUDPPort() { // std::vector<int> getReceiverUDPPort() {
std::vector<int> vec; // std::vector<int> vec;
vec.reserve(det.size()); // vec.reserve(det.size());
for (size_t i = 0; i < det.size(); ++i) { // for (size_t i = 0; i < det.size(); ++i) {
vec.push_back(det.getReceiverUDPPort(i)); // vec.push_back(det.getReceiverUDPPort(i));
}
return vec;
}
std::vector<int> getReceiverUDPPort2() {
std::vector<int> vec;
vec.reserve(det.size());
for (size_t i = 0; i < det.size(); ++i) {
vec.push_back(det.getReceiverUDPPort2(i));
}
return vec;
}
void setReceiverUDPPort(int port, int det_id) {
det.setReceiverUDPPort(port, det_id);
}
void setReceiverUDPPort2(int port, int det_id) {
det.setReceiverUDPPort2(port, det_id);
}
// //Set network parameter for all modules if det_id == -1 otherwise the
// module
// //specified with det_id.
// void setDetectorNetworkParameter(std::string par_name, std::string par,
// const int det_id) {
// auto p = networkNameToEnum(par_name);
// if (det_id == -1) {
// det.setDetectorNetworkParameter(p, par);
// } else {
// det.setDetectorNetworkParameter(p, par, det_id);
// } // }
// return vec;
// }
// std::vector<int> getReceiverUDPPort2() {
// std::vector<int> vec;
// vec.reserve(det.size());
// for (size_t i = 0; i < det.size(); ++i) {
// vec.push_back(det.getReceiverUDPPort2(i));
// }
// return vec;
// }
// void setReceiverUDPPort(int port, int det_id) {
// det.setReceiverUDPPort(port, det_id);
// }
// void setReceiverUDPPort2(int port, int det_id) {
// det.setReceiverUDPPort2(port, det_id);
// } // }
void configureNetworkParameters() { det.configureMAC(); }
std::string getLastClientIP() { return det.getLastClientIP(); } std::string getLastClientIP() { return det.getLastClientIP(); }
std::string getReceiverLastClientIP() { std::string getReceiverLastClientIP() {

1
python/src/experimental.cpp
View File

@ -118,7 +118,6 @@ void init_experimental(py::module &m) {
py::arg() = Positions{}) py::arg() = Positions{})
// Network Configuration (Detector<->Receiver) // Network Configuration (Detector<->Receiver)
.def("configureMAC", &Detector::configureMAC, py::arg() = Positions{})
.def("getNumberofUDPInterfaces", &Detector::getNumberofUDPInterfaces, .def("getNumberofUDPInterfaces", &Detector::getNumberofUDPInterfaces,
py::arg() = Positions{}) py::arg() = Positions{})

22
python/src/main.cpp
View File

@ -210,22 +210,20 @@ PYBIND11_MODULE(_sls_detector, m) {
&DetectorPythonInterface::getReceiverStreamingPort) &DetectorPythonInterface::getReceiverStreamingPort)
.def("setReceiverStreamingPort", .def("setReceiverStreamingPort",
&DetectorPythonInterface::setReceiverStreamingPort) &DetectorPythonInterface::setReceiverStreamingPort)
.def("getReceiverUDPPort", &DetectorPythonInterface::getReceiverUDPPort) // .def("getReceiverUDPPort", &DetectorPythonInterface::getReceiverUDPPort)
.def("getReceiverUDPPort2", // .def("getReceiverUDPPort2",
&DetectorPythonInterface::getReceiverUDPPort2) // &DetectorPythonInterface::getReceiverUDPPort2)
.def("setReceiverUDPPort", &DetectorPythonInterface::setReceiverUDPPort) // .def("setReceiverUDPPort", &DetectorPythonInterface::setReceiverUDPPort)
.def("setReceiverUDPPort2", // .def("setReceiverUDPPort2",
&DetectorPythonInterface::setReceiverUDPPort2) // &DetectorPythonInterface::setReceiverUDPPort2)
.def("setReceiverUDPIP", &DetectorPythonInterface::setReceiverUDPIP) // .def("setReceiverUDPIP", &DetectorPythonInterface::setReceiverUDPIP)
.def("getReceiverUDPIP", &DetectorPythonInterface::getReceiverUDPIP) // .def("getReceiverUDPIP", &DetectorPythonInterface::getReceiverUDPIP)
.def("getReceiverUDPMAC", &DetectorPythonInterface::getReceiverUDPMAC) // .def("getReceiverUDPMAC", &DetectorPythonInterface::getReceiverUDPMAC)
.def("setReceiverUDPMAC", &DetectorPythonInterface::setReceiverUDPMAC) // .def("setReceiverUDPMAC", &DetectorPythonInterface::setReceiverUDPMAC)
.def("getReceiverPort", &DetectorPythonInterface::getReceiverPort) .def("getReceiverPort", &DetectorPythonInterface::getReceiverPort)
.def("setReceiverPort", &DetectorPythonInterface::setReceiverPort) .def("setReceiverPort", &DetectorPythonInterface::setReceiverPort)
.def("configureNetworkParameters",
&DetectorPythonInterface::configureNetworkParameters)
.def("getDelayFrame", &DetectorPythonInterface::getDelayFrame) .def("getDelayFrame", &DetectorPythonInterface::getDelayFrame)
.def("setDelayFrame", &DetectorPythonInterface::setDelayFrame) .def("setDelayFrame", &DetectorPythonInterface::setDelayFrame)
.def("getDelayLeft", &DetectorPythonInterface::getDelayLeft) .def("getDelayLeft", &DetectorPythonInterface::getDelayLeft)