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

rewrote settings enums, gainmode enums

Browse Source
This commit is contained in:
maliakal_d
2021-08-04 13:07:48 +02:00
parent 550810a3ca
commit 0e5e0f346b
16 changed files with 109 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
slsDetectorSoftware/tests/test-CmdProxy-jungfrau.cpp
View File

@ -456,6 +456,11 @@ TEST_CASE("gainmode", "[.cmd]") {
proxy.Call("gainmode", {}, -1, GET, oss);
REQUIRE(oss.str() == "gainmode forceswitchg1\n");
}
{
std::ostringstream oss;
proxy.Call("gainmode", {"dynamicgain"}, -1, PUT, oss);
REQUIRE(oss.str() == "gainmode dynamicgain\n");
}
{
std::ostringstream oss;
proxy.Call("gainmode", {"forceswitchg2"}, -1, PUT, oss);
@ -473,8 +478,8 @@ TEST_CASE("gainmode", "[.cmd]") {
}
{
std::ostringstream oss;
proxy.Call("gainmode", {"dynamic"}, -1, PUT, oss);
REQUIRE(oss.str() == "gainmode dynamic\n");
proxy.Call("gainmode", {"fixg0"}, -1, PUT, oss);
REQUIRE(oss.str() == "gainmode fixg0\n");
}
for (int i = 0; i != det.size(); ++i) {
det.setGainMode(prev_val[i], {i});

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

@ -150,7 +150,7 @@ TEST_CASE("settings", "[.cmd]") {
allSett.push_back("lowgain");
allSett.push_back("mediumgain");
allSett.push_back("veryhighgain");
allSett.push_back("dynamichg0");
allSett.push_back("highgain0");
allSett.push_back("fixgain1");
allSett.push_back("fixgain2");
allSett.push_back("verylowgain");
@ -164,12 +164,13 @@ TEST_CASE("settings", "[.cmd]") {
allSett.push_back("g4_lg");
allSett.push_back("forceswitchg1");
allSett.push_back("forceswitchg2");
allSett.push_back("gain0");
std::vector<std::string> sett;
switch (det_type) {
case defs::JUNGFRAU:
sett.push_back("dynamicgain");
sett.push_back("dynamichg0");
sett.push_back("gain0");
sett.push_back("highgain0");
break;
case defs::GOTTHARD:
sett.push_back("highgain");