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

master file no index

Browse Source
This commit is contained in:
Erik Frojdh
2020-09-23 16:28:50 +02:00
parent 23720e3c63
commit 0b0f5c94d5
8 changed files with 66 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
slsDetectorSoftware/src/CmdProxy.h
View File

@ -563,11 +563,16 @@ class CmdProxy {
return ToStringHex(value, width);
}
template <typename V> std::string OutString(const V &value) {
template <typename V> std::string OutString(const sls::Result<V> &value) {
if (value.equal())
return ToString(value.front());
return ToString(value);
}
template <typename V> std::string OutString(const V &value) {
return ToString(value);
}
template <typename V>
std::string OutString(const V &value, const std::string &unit) {
if (value.equal())

8
slsDetectorSoftware/src/Detector.cpp
View File

@ -979,12 +979,12 @@ void Detector::setFileWrite(bool value, Positions pos) {
pimpl->Parallel(&Module::setFileWrite, pos, value);
}
void Detector::setMasterFileWrite(bool value, Positions pos) {
pimpl->Parallel(&Module::setMasterFileWrite, pos, value);
void Detector::setMasterFileWrite(bool value) {
pimpl->Parallel(&Module::setMasterFileWrite, {0}, value);
}
Result<bool> Detector::getMasterFileWrite(Positions pos) const {
return pimpl->Parallel(&Module::getMasterFileWrite, pos);
bool Detector::getMasterFileWrite() const {
return pimpl->Parallel(&Module::getMasterFileWrite, {0})[0];
}
Result<bool> Detector::getFileOverWrite(Positions pos) const {