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

refactor getID

Browse Source
This commit is contained in:
Erik Frojdh
2019-03-19 16:27:07 +01:00
parent 38bf540c1a
commit 6759b2eeb8
9 changed files with 253 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@@ -176,6 +176,15 @@ int64_t multiSlsDetector::getId(idMode mode, int detPos) {
return sls::minusOneIfDifferent(r);
}
int64_t multiSlsDetector::getReceiverSoftwareVersion(int detPos) const {
if (detPos >= 0) {
return detectors[detPos]->getReceiverSoftwareVersion();
}
auto r = parallelCall(&slsDetector::getReceiverSoftwareVersion);
return sls::minusOneIfDifferent(r);
}
std::vector<int64_t> multiSlsDetector::getDetectorNumber() {
return parallelCall(&slsDetector::getId, slsDetectorDefs::DETECTOR_SERIAL_NUMBER);
}

9
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@@ -9,6 +9,7 @@
*/
#include "SharedMemory.h"
#include "error_defs.h"
#include "gitInfoLib.h"
#include "logger.h"
#include "sls_detector_defs.h"
class slsDetector;
@@ -225,7 +226,13 @@ class multiSlsDetector : public virtual slsDetectorDefs,
*/
int64_t getId(idMode mode, int detPos = -1);
std::vector<int64_t> getDetectorNumber();
int64_t getClientSoftwareVersion() const {
return GITDATE;
}
int64_t getReceiverSoftwareVersion(int detPos = -1) const;
std::vector<int64_t> getDetectorNumber();
/**
* Free shared memory from the command line
* avoiding creating the constructor classes and mapping