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

tests mainly and minor print

Browse Source
This commit is contained in:
maliakal_d
2020-05-22 15:23:56 +02:00
parent 02d8b1fb5f
commit 0a66605111
2 changed files with 139 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/src/CmdProxy.cpp
View File

@ -774,7 +774,7 @@ std::string CmdProxy::ExternalSignal(int action) {
WrongNumberOfParameters(1); WrongNumberOfParameters(1);
} }
auto t = det->getExternalSignalFlags(StringTo<int>(args[0]), {det_id}); auto t = det->getExternalSignalFlags(StringTo<int>(args[0]), {det_id});
os << OutString(t) << '\n'; os << args[0] << " " << OutString(t) << '\n';
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
if (args.size() != 2) { if (args.size() != 2) {
WrongNumberOfParameters(2); WrongNumberOfParameters(2);
@ -782,7 +782,7 @@ std::string CmdProxy::ExternalSignal(int action) {
det->setExternalSignalFlags( det->setExternalSignalFlags(
StringTo<int>(args[0]), StringTo<int>(args[0]),
StringTo<slsDetectorDefs::externalSignalFlag>(args[1]), {det_id}); StringTo<slsDetectorDefs::externalSignalFlag>(args[1]), {det_id});
os << args[1] << '\n'; os << args[0] << " " << args[1] << '\n';
} else { } else {
throw sls::RuntimeError("Unknown action"); throw sls::RuntimeError("Unknown action");
} }

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

@ -190,6 +190,46 @@ TEST_CASE("settings", "[.cmd][.new]") {
} }
} }
TEST_CASE("trimbits", "[.cmd][.new]") {
Detector det;
CmdProxy proxy(&det);
REQUIRE_NOTHROW(proxy.Call("trimbits", {}, -1, GET));
}
TEST_CASE("trimval", "[.cmd][.new]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
if (det_type == defs::MYTHEN3 || det_type == defs::EIGER) {
auto prev_val = det.getAllTrimbits();
{
std::ostringstream oss;
proxy.Call("trimval", {"63"}, -1, PUT, oss);
REQUIRE(oss.str() == "trimval 63\n");
}
{
std::ostringstream oss;
proxy.Call("trimval", {"0"}, -1, PUT, oss);
REQUIRE(oss.str() == "trimval 0\n");
}
{
std::ostringstream oss;
proxy.Call("trimval", {}, -1, GET, oss);
REQUIRE(oss.str() == "trimval 0\n");
}
REQUIRE_THROWS(proxy.Call("trimval", {"64"}, -1, PUT));
REQUIRE_THROWS(proxy.Call("trimval", {"-1"}, -1, PUT));
for (int i = 0; i != det.size(); ++i) {
if (prev_val[i] != -1) {
det.setAllTrimbits(prev_val[i], {i});
}
}
} else {
REQUIRE_THROWS(proxy.Call("trimval", {}, -1, GET));
}
}
/* acquisition parameters */ /* acquisition parameters */
// acquire: not testing // acquire: not testing
@ -407,9 +447,27 @@ TEST_CASE("timing", "[.cmd][.new]") {
proxy.Call("timing", {}, -1, GET, oss2); proxy.Call("timing", {}, -1, GET, oss2);
REQUIRE(oss2.str() == "timing burst_trigger\n"); REQUIRE(oss2.str() == "timing burst_trigger\n");
} }
REQUIRE_THROWS(proxy.Call("timing", {"trigger_gating"}, -1, PUT));
} else if (det_type == defs::MYTHEN3) {
{
std::ostringstream oss1, oss2;
proxy.Call("timing", {"gating"}, -1, PUT, oss1);
REQUIRE(oss1.str() == "timing gating\n");
proxy.Call("timing", {}, -1, GET, oss2);
REQUIRE(oss2.str() == "timing gating\n");
}
{
std::ostringstream oss1, oss2;
proxy.Call("timing", {"trigger_gating"}, -1, PUT, oss1);
REQUIRE(oss1.str() == "timing trigger_gating\n");
proxy.Call("timing", {}, -1, GET, oss2);
REQUIRE(oss2.str() == "timing trigger_gating\n");
}
REQUIRE_THROWS(proxy.Call("timing", {"burst_trigger"}, -1, PUT));
} else { } else {
REQUIRE_THROWS(proxy.Call("timing", {"gating"}, -1, PUT)); REQUIRE_THROWS(proxy.Call("timing", {"gating"}, -1, PUT));
REQUIRE_THROWS(proxy.Call("timing", {"burst_trigger"}, -1, PUT)); REQUIRE_THROWS(proxy.Call("timing", {"burst_trigger"}, -1, PUT));
REQUIRE_THROWS(proxy.Call("timing", {"trigger_gating"}, -1, PUT));
} }
for (int i = 0; i != det.size(); ++i) { for (int i = 0; i != det.size(); ++i) {
det.setTimingMode(prev_val[i], {i}); det.setTimingMode(prev_val[i], {i});
@ -812,6 +870,85 @@ TEST_CASE("imagetest", "[.cmd][.new]") {
} }
} }
TEST_CASE("extsig", "[.cmd][.new]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
if (det_type == defs::GOTTHARD) {
auto prev_val = det.getExternalSignalFlags(0);
REQUIRE_THROWS(proxy.Call("extsig", {}, -1, GET));
REQUIRE_THROWS(proxy.Call("extsig", {"1"}, -1, GET));
REQUIRE_THROWS(proxy.Call("extsig", {"0", "inversion_on"}, -1, PUT));
REQUIRE_THROWS(proxy.Call("extsig", {"0", "inversion_off"}, -1, PUT));
{
std::ostringstream oss1, oss2;
proxy.Call("extsig", {"0", "trigger_in_rising_edge"}, -1, PUT,
oss1);
REQUIRE(oss1.str() == "extsig 0 trigger_in_rising_edge\n");
proxy.Call("extsig", {"0"}, -1, GET, oss2);
REQUIRE(oss2.str() == "extsig trigger_in_rising_edge\n");
}
{
std::ostringstream oss1, oss2;
proxy.Call("extsig", {"0", "trigger_in_falling_edge"}, -1, PUT,
oss1);
REQUIRE(oss1.str() == "extsig 0 trigger_in_falling_edge\n");
proxy.Call("extsig", {"0"}, -1, GET, oss2);
REQUIRE(oss2.str() == "extsig 0 trigger_in_falling_edge\n");
}
for (int i = 0; i != det.size(); ++i) {
det.setExternalSignalFlags(0, prev_val[i], {i});
}
} else if (det_type == defs::MYTHEN3) {
auto prev_val_0 = det.getExternalSignalFlags(0);
auto prev_val_1 = det.getExternalSignalFlags(1);
REQUIRE_THROWS(proxy.Call("extsig", {}, -1, GET));
REQUIRE_THROWS(proxy.Call("extsig", {"8"}, -1, GET));
REQUIRE_THROWS(proxy.Call("extsig", {"0", "inversion_on"}, -1, PUT));
REQUIRE_THROWS(proxy.Call("extsig", {"0", "inversion_off"}, -1, PUT));
REQUIRE_THROWS(
proxy.Call("extsig", {"1", "trigger_in_rising_edge"}, -1, PUT));
REQUIRE_THROWS(
proxy.Call("extsig", {"1", "trigger_in_falling_edge"}, -1, PUT));
{
std::ostringstream oss1, oss2;
proxy.Call("extsig", {"0", "trigger_in_rising_edge"}, -1, PUT,
oss1);
REQUIRE(oss1.str() == "extsig 0 trigger_in_rising_edge\n");
proxy.Call("extsig", {"0"}, -1, GET, oss2);
REQUIRE(oss2.str() == "extsig trigger_in_rising_edge\n");
}
{
std::ostringstream oss1, oss2;
proxy.Call("extsig", {"0", "trigger_in_falling_edge"}, -1, PUT,
oss1);
REQUIRE(oss1.str() == "extsig 0 trigger_in_falling_edge\n");
proxy.Call("extsig", {"0"}, -1, GET, oss2);
REQUIRE(oss2.str() == "extsig 0 trigger_in_falling_edge\n");
}
{
std::ostringstream oss1, oss2;
proxy.Call("extsig", {"1", "inversion_off"}, -1, PUT, oss1);
REQUIRE(oss1.str() == "extsig 1 inversion_off\n");
proxy.Call("extsig", {"1"}, -1, GET, oss2);
REQUIRE(oss2.str() == "extsig inversion_off\n");
}
{
std::ostringstream oss1, oss2;
proxy.Call("extsig", {"1", "inversion_on"}, -1, PUT, oss1);
REQUIRE(oss1.str() == "extsig 1 inversion_on\n");
proxy.Call("extsig", {"1"}, -1, GET, oss2);
REQUIRE(oss2.str() == "extsig 1 inversion_on\n");
}
for (int i = 0; i != det.size(); ++i) {
det.setExternalSignalFlags(0, prev_val_0[i], {i});
det.setExternalSignalFlags(1, prev_val_1[i], {i});
}
} else {
REQUIRE_THROWS(proxy.Call("extsig", {}, -1, GET));
}
}
/** temperature */ /** temperature */
TEST_CASE("temp_adc", "[.cmd][.new]") { TEST_CASE("temp_adc", "[.cmd][.new]") {
@ -2366,29 +2503,6 @@ TEST_CASE("stopport", "[.cmd]") {
// } // }
// } // }
// TEST_CASE("trimval", "[.cmd][.eiger]") {
// if (test::type == defs::EIGER) {
// {
// std::ostringstream oss;
// REQUIRE_NOTHROW(multiSlsDetectorClient("trimval 63", PUT,
// nullptr, oss)); REQUIRE(oss.str() == "trimval 63\n");
// }
// {
// std::ostringstream oss;
// REQUIRE_NOTHROW(multiSlsDetectorClient("trimval", GET, nullptr,
// oss)); REQUIRE(oss.str() == "trimval 63\n");
// }
// {
// std::ostringstream oss;
// REQUIRE_NOTHROW(multiSlsDetectorClient("trimval 31", PUT,
// nullptr, oss)); REQUIRE(oss.str() == "trimval 31\n");
// }
// REQUIRE_NOTHROW(multiSlsDetectorClient("trimval 0", PUT));
// } else {
// REQUIRE_THROWS(multiSlsDetectorClient("trimval", GET));
// }
// }
// TEST_CASE("flippeddatax", "[.cmd][.eiger]") { // TEST_CASE("flippeddatax", "[.cmd][.eiger]") {
// if (test::type == defs::EIGER) { // if (test::type == defs::EIGER) {
// { // {