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

advanced down

Browse Source
This commit is contained in:
maliakal_d
2019-05-08 16:44:08 +02:00
parent 2a1c89f712
commit c30485a65b
18 changed files with 1766 additions and 1648 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
slsDetectorSoftware/src/multiSlsDetector.cpp
View File

@@ -674,6 +674,15 @@ int multiSlsDetector::setOnline(int value, int detPos) {
return multi_shm()->onlineFlag;
}
int multiSlsDetector::getOnlineFlag(int detPos) {
if (detPos >= 0) {
return detectors[detPos]->getOnlineFlag();
}
auto r = serialCall(&slsDetector::getOnlineFlag);
return sls::minusOneIfDifferent(r);
}
std::string multiSlsDetector::checkOnline(int detPos) {
if (detPos >= 0) {
return detectors[detPos]->checkOnline();
@@ -710,8 +719,13 @@ int multiSlsDetector::setReceiverPort(int port_number, int detPos) {
return sls::minusOneIfDifferent(r);
}
std::vector<int> multiSlsDetector::getReceiverPort() const {
return parallelCall(&slsDetector::getReceiverPort);
int multiSlsDetector::getReceiverPort(int detPos) const {
if (detPos >= 0) {
return detectors[detPos]->getReceiverPort();
}
auto r = serialCall(&slsDetector::getReceiverPort);
return sls::minusOneIfDifferent(r);
}
int multiSlsDetector::lockServer(int p, int detPos) {
@@ -2887,6 +2901,17 @@ int multiSlsDetector::setReceiverOnline(int value, int detPos) {
return multi_shm()->receiverOnlineFlag;
}
int multiSlsDetector::getReceiverOnlineFlag(int detPos) {
// single
if (detPos >= 0) {
return detectors[detPos]->getReceiverOnlineFlag();
}
// multi
auto r = parallelCall(&slsDetector::getReceiverOnlineFlag);
return sls::minusOneIfDifferent(r);
}
std::string multiSlsDetector::checkReceiverOnline(int detPos) {
// single
if (detPos >= 0) {

2
slsDetectorSoftware/src/slsDetector.cpp
View File

@@ -3270,7 +3270,7 @@ int slsDetector::setReceiverOnline(int value) {
return shm()->rxOnlineFlag;
}
int slsDetector::getReceiverOnline() const { return shm()->rxOnlineFlag; }
int slsDetector::getReceiverOnlineFlag() const { return shm()->rxOnlineFlag; }
std::string slsDetector::checkReceiverOnline() {
try {