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

WIP, rxhostname

Browse Source
This commit is contained in:
maliakal_d
2020-04-20 18:33:14 +02:00
parent 1d31695cc1
commit 601be462af
11 changed files with 232 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
slsDetectorSoftware/src/Detector.cpp
View File

@ -679,7 +679,7 @@ void Detector::setDestinationUDPPort2(int port, int module_id) {
}
Result<std::string> Detector::printRxConfiguration(Positions pos) const {
return pimpl->Parallel(&Module::printReceiverConfiguration, pos);
return pimpl->Parallel3(&Receiver::printConfiguration); // ignoring pos FIXME
}
Result<bool> Detector::getTenGiga(Positions pos) const {
@ -747,32 +747,16 @@ Result<std::string> Detector::getRxHostname(const int udpInterface, Positions po
}
void Detector::setRxHostname(const int udpInterface, const std::string &hostname, Positions pos) {
if (getDetectorStatus(pos).squash(defs::ERROR) == defs::RUNNING) {
LOG(logWARNING) << "Acquisition already running, Stopping it.";
stopDetector();
}
if (!pimpl->isReceiverInitialized(udpInterface)) {
pimpl->initReceiver(udpInterface);
}
if (udpInterface == 1) {
pimpl->Parallel1(&Receiver::setHostname, pos, {}, hostname);
} else {
pimpl->Parallel2(&Receiver::setHostname, pos, {}, hostname);
}
int port = 0;
pimpl->configureReceiver(udpInterface, pos, hostname, port);
}
void Detector::setRxHostname(const int udpInterface, const std::string &hostname, const int port,
int module_id) {
if (!pimpl->isReceiverInitialized(udpInterface)) {
pimpl->initReceiver(udpInterface);
}
if (udpInterface == 1) {
pimpl->Parallel1(&Receiver::setTCPPort, {module_id}, {}, port);
pimpl->Parallel1(&Receiver::setHostname, {module_id}, {}, hostname);
} else {
pimpl->Parallel2(&Receiver::setTCPPort, {module_id}, {}, port);
pimpl->Parallel2(&Receiver::setHostname, {module_id}, {}, hostname);
if (module_id == -1 && size() > 1) {
throw sls::RuntimeError("Cannot set same rx_tcpport and rx_hostname for multiple receivers");
}
pimpl->configureReceiver(udpInterface, {module_id}, hostname, port);
}
Result<int> Detector::getRxPort(const int udpInterface, Positions pos) const {