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

WIP

Browse Source
This commit is contained in:
maliakal_d 2019-08-13 11:19:25 +02:00
parent 6f6ee19906
commit 2fe06c7163
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/include/Result.h
View File

@ -97,16 +97,6 @@ template <class T, class Allocator = std::allocator<T>> class Result {
vec.push_back(std::forward<V>(value));
}
/** Disable emplace_back if the underlying vector does not support it
* vector<bool> gcc 4.8
*/
template <typename... Args>
auto emplace_back(Args &&... args) ->
typename std::enable_if<has_emplace_back<std::vector<T>>::value,
decltype(vec.emplace_back(args...))>::type {
return vec.emplace_back(std::forward<Args>(args)...);
}
auto operator[](size_type pos) -> decltype(vec[pos]) { return vec[pos]; }
const_reference operator[](size_type pos) const { return vec[pos]; }

5
slsDetectorSoftware/src/Detector.cpp
View File

@ -1072,7 +1072,7 @@ void Detector::setCounterBit(bool value, Positions pos) {
}
Result<std::vector<defs::ROI>> Detector::getROI(Positions pos) const {
//vector holding module_id for the modules that should be read
//vector holding module_id for the modules that should be read
const std::vector<int> id_vec = [&]() {
if (pos.empty() || (pos.size() == 1 && pos[0] == -1)){
std::vector<int> tmp;
@ -1084,6 +1084,7 @@ Result<std::vector<defs::ROI>> Detector::getROI(Positions pos) const {
}
}();
//values to return
Result<std::vector<defs::ROI>> res;
@ -1091,7 +1092,7 @@ Result<std::vector<defs::ROI>> Detector::getROI(Positions pos) const {
for (const auto& i :id_vec){
int n = 0;
auto ptr = pimpl->getROI(n, i);
res.emplace_back(ptr, ptr+n);
// res.emplace_back(ptr, ptr+n);
}
return res;
}