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

doesnt compile

Browse Source
This commit is contained in:
maliakal_d
2019-08-12 19:13:33 +02:00
parent 25eccdffab f99ebc7f21
commit 9686f78300
7 changed files with 342 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/include/Detector.h
View File

@ -1089,14 +1089,14 @@ class Detector {
/** [Eiger] If it is set, it resets chips completely (else partially) before an acquisition TODO: if it makes sense */
void setCounterBit(bool value, Positions pos = {});
/** [Gotthard, CTB] subset modules not allowed */
//Result<std::vector<defs::ROI>> getROI(Positions pos = {}) const;
/** [Gotthard, CTB]*/
Result<std::vector<defs::ROI>> getROI(Positions pos = {}) const;
/**
* [Gotthard Options: Only a single chip or all chips, only 1 ROI allowed]
* [CTB: multiple ROIs allowed]
* subset modules not allowed
*/
//void setROI(std::vector<defs::ROI> value, Positions pos = {});
void setROI(std::vector<defs::ROI> value, Positions pos = {});
/** [CTB]*/
Result<uint32_t> getADCEnableMask(Positions pos = {}) const;

5
slsDetectorSoftware/include/Result.h
View File

@ -98,6 +98,11 @@ template <class T, class Allocator = std::allocator<T>> class Result {
vec.push_back(std::forward<V>(value));
}
template <typename... Args>
auto emplace_back(Args &&... args) -> decltype(vec.emplace_back(args...)){
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]; }