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

serialnumber fixed to point to mod id reg

Browse Source
This commit is contained in:
maliakal_d
2021-08-11 19:30:25 +02:00
parent 8e6a0cbfda
commit ff9eaaf3f3
6 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorSoftware/src/CmdProxy.cpp
View File

@ -261,8 +261,7 @@ std::string CmdProxy::SerialNumber(int action) {
std::ostringstream os;
os << cmd << ' ';
if (action == slsDetectorDefs::HELP_ACTION)
os << "\n\tSerial number of detector.\n\t[Gotthard2] Can overwrite, "
"but must do so for every detector server restart."
os << "\n\tSerial number of detector.\n\t[Gotthard2] Can overwrite"
<< '\n';
else if (action == slsDetectorDefs::GET_ACTION) {
if (!args.empty()) {

5
slsDetectorSoftware/tests/test-CmdProxy.cpp
View File

@ -107,11 +107,14 @@ TEST_CASE("serialnumber", "[.cmd]") {
REQUIRE_NOTHROW(proxy.Call("serialnumber", {}, -1, GET));
if (det.getDetectorType().squash() == defs::GOTTHARD2) {
auto prev_val = det.getSerialNumber();
std::ostringstream oss1, oss2;
std::ostringstream oss1, oss2, oss3;
proxy.Call("serialnumber", {"0x5d"}, -1, PUT, oss1);
REQUIRE(oss1.str() == "serialnumber 0x5d\n");
proxy.Call("serialnumber", {}, -1, GET, oss2);
REQUIRE(oss2.str() == "serialnumber 0x5d\n");
proxy.Call("serialnumber", {"0xffff"}, -1, PUT, oss3);
REQUIRE(oss3.str() == "serialnumber 0xffff\n");
REQUIRE_THROWS(proxy.Call("serialnumber", {"65536"}, -1, PUT));
for (int i = 0; i != det.size(); ++i) {
det.setSerialNumber(prev_val[i], {i});
}