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

more ctb

Browse Source
This commit is contained in:
Erik Frojdh
2019-08-08 10:18:21 +02:00
parent bba6e1667b
commit 095a7eac05
5 changed files with 103 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
slsDetectorSoftware/src/Detector.cpp
View File

@ -171,6 +171,19 @@ Result<std::string> Detector::getDetectorTypeAsString(Positions pos) const {
// Erik
Result<uint64_t> Detector::getPatternMask(Positions pos){
return pimpl->Parallel(&slsDetector::getPatternMask, pos);
}
void Detector::setPatternBitMask(uint64_t mask, Positions pos){
pimpl->Parallel(&slsDetector::setPatternBitMask, pos, mask);
}
Result<uint64_t> Detector::getPatternBitMask(Positions pos) const{
return pimpl->Parallel(&slsDetector::getPatternBitMask, pos);
}
void Detector::setLEDEnable(bool enable, Positions pos) {
pimpl->Parallel(&slsDetector::setLEDEnable, pos, static_cast<int>(enable));
}

11
slsDetectorSoftware/src/multiSlsDetector.cpp
View File

@ -476,17 +476,6 @@ void multiSlsDetector::addSlsDetector(const std::string &hostname) {
multi_shm()->multiDetectorType = getDetectorTypeAsEnum(-1);// -1 needed here
}
void multiSlsDetector::addSlsDetector(std::unique_ptr<slsDetector> det) {
detectors.push_back(std::move(det));
multi_shm()->numberOfDetectors = detectors.size();
multi_shm()->dataBytes += detectors.back()->getDataBytes();
multi_shm()->dataBytesInclGapPixels +=
detectors.back()->getDataBytesInclGapPixels();
multi_shm()->numberOfChannels +=
detectors.back()->getTotalNumberOfChannels();
multi_shm()->multiDetectorType = getDetectorTypeAsEnum(-1);// -1 needed here
}
slsDetectorDefs::detectorType multiSlsDetector::getDetectorTypeAsEnum() const {
return multi_shm()->multiDetectorType;
}