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

some more changes, yet to do receiver

Browse Source
This commit is contained in:
maliakal_d
2018-10-09 12:31:12 +02:00
parent 45b00c4e7d
commit 4bcc24a59f
7 changed files with 99 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -962,6 +962,18 @@ int multiSlsDetector::exitServer(int detPos) {
}
int multiSlsDetector::execCommand(std::string cmd, int detPos) {
// single
if (detPos >= 0) {
return detectors[detPos]->execCommand(cmd);
}
// multi
auto r = parallelCall(&slsDetector::execCommand, cmd);
return sls::allEqualTo(r, static_cast<int>(OK)) ? OK : FAIL;
}
int multiSlsDetector::readConfigurationFile(std::string const fname) {
freeSharedMemory();
setupMultiDetector();

8
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -453,6 +453,14 @@ public:
*/
int exitServer(int detPos = -1);
/**
* Execute a command on the detector server
* @param cmd command
* @param detPos -1 for all detectors in list or specific detector position
* @returns OK or FAIL
*/
int execCommand(std::string cmd, int detPos);
/**
* Load configuration from a configuration File
* @param fname configuration file name