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

Merge branch 'apidhanya' of github.com:slsdetectorgroup/slsDetectorPackage into apidhanya

Browse Source
This commit is contained in:
maliakal_d
2019-08-09 16:16:25 +02:00
parent 4a97dd0eba dea402a7e7
commit cac353748e
5 changed files with 312 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorSoftware/src/multiSlsDetector.cpp
View File

@ -655,7 +655,7 @@ std::string multiSlsDetector::getDetectorTypeAsString(int detPos) {
return sls::concatenateIfDifferent(r);
}
int multiSlsDetector::size() const { return detectors.size(); }
size_t multiSlsDetector::size() const { return detectors.size(); }
int multiSlsDetector::getNumberOfDetectors(dimension d) const {
return multi_shm()->numberOfDetector[d];
@ -1926,6 +1926,7 @@ void multiSlsDetector::setReceiverDataStreamingOutIP(const std::string &ip,
}
}
std::string multiSlsDetector::getReceiverStreamingIP(int detPos) {
// single
if (detPos >= 0) {