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

Merge branch 'developer' into apidhanya

Browse Source
This commit is contained in:
maliakal_d
2019-08-07 15:54:17 +02:00
parent 0a2a5933da 704a26af70
commit e246a33269
4 changed files with 82 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
slsDetectorSoftware/src/Detector.cpp
View File

@ -51,9 +51,8 @@ Result<uint32_t> Detector::getRegister(uint32_t addr, Positions pos) {
}
Result<ns> Detector::getExptime(Positions pos) const {
auto r = pimpl->Parallel(&slsDetector::setTimer, pos,
defs::ACQUISITION_TIME, -1);
return Result<ns>(begin(r), end(r));
return pimpl->Parallel(&slsDetector::setTimer, pos, defs::ACQUISITION_TIME,
-1);
}
Result<uint64_t> Detector::getStartingFrameNumber(Positions pos) const {
@ -69,9 +68,8 @@ void Detector::setExptime(ns t, Positions pos) {
}
Result<ns> Detector::getSubExptime(Positions pos) const {
auto r = pimpl->Parallel(&slsDetector::setTimer, pos,
defs::SUBFRAME_ACQUISITION_TIME, -1);
return Result<ns>(begin(r), end(r));
return pimpl->Parallel(&slsDetector::setTimer, pos,
defs::SUBFRAME_ACQUISITION_TIME, -1);
}
void Detector::setSubExptime(ns t, Positions pos) {
@ -80,9 +78,7 @@ void Detector::setSubExptime(ns t, Positions pos) {
}
Result<ns> Detector::getPeriod(Positions pos) const {
auto r =
pimpl->Parallel(&slsDetector::setTimer, pos, defs::FRAME_PERIOD, -1);
return Result<ns>(begin(r), end(r));
return pimpl->Parallel(&slsDetector::setTimer, pos, defs::FRAME_PERIOD, -1);
}
void Detector::setPeriod(ns t, Positions pos) {