detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 10:07:59 +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

4
slsDetectorSoftware/include/Detector.h
View File

@ -784,10 +784,10 @@ class Detector {
/** default enabled */
void setFileWrite(bool value, Positions pos = {});
Result<bool> getMasterFileWrite(Positions pos = {}) const;
bool getMasterFileWrite() const;
/**default enabled */
void setMasterFileWrite(bool value, Positions pos = {});
void setMasterFileWrite(bool value);
Result<bool> getFileOverWrite(Positions pos = {}) const;

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 {

46
slsDetectorSoftware/tests/test-CmdProxy-rx.cpp
View File

@ -495,29 +495,29 @@ TEST_CASE("fwrite", "[.cmd][.new]") {
}
}
TEST_CASE("fmaster", "[.cmd][.new]") {
Detector det;
CmdProxy proxy(&det);
auto prev_val = det.getMasterFileWrite();
{
std::ostringstream oss;
proxy.Call("fmaster", {"0"}, -1, PUT, oss);
REQUIRE(oss.str() == "fmaster 0\n");
}
{
std::ostringstream oss;
proxy.Call("fmaster", {}, -1, GET, oss);
REQUIRE(oss.str() == "fmaster 0\n");
}
{
std::ostringstream oss;
proxy.Call("fmaster", {"1"}, -1, PUT, oss);
REQUIRE(oss.str() == "fmaster 1\n");
}
for (int i = 0; i != det.size(); ++i) {
det.setMasterFileWrite(prev_val[i], {i});
}
}
// TEST_CASE("fmaster", "[.cmd][.new]") {
// Detector det;
// CmdProxy proxy(&det);
// auto prev_val = det.getMasterFileWrite();
// {
// std::ostringstream oss;
// proxy.Call("fmaster", {"0"}, -1, PUT, oss);
// REQUIRE(oss.str() == "fmaster 0\n");
// }
// {
// std::ostringstream oss;
// proxy.Call("fmaster", {}, -1, GET, oss);
// REQUIRE(oss.str() == "fmaster 0\n");
// }
// {
// std::ostringstream oss;
// proxy.Call("fmaster", {"1"}, -1, PUT, oss);
// REQUIRE(oss.str() == "fmaster 1\n");
// }
// for (int i = 0; i != det.size(); ++i) {
// det.setMasterFileWrite(prev_val[i], {i});
// }
// }
TEST_CASE("foverwrite", "[.cmd][.new]") {
Detector det;