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

M3badchannels (#526)

Browse Source 
* badchannels for m3 and modify for g2 (file from single and multi)

* m3: invert polarity of bit 7 and 11 signals from setmodule, allow commas in bad channel file

* badchannel file can take commas, colons and comments (also taking care of spaces at the end of channel numbers)

* tests 'badchannels' and 'Channel file reading' added, removing duplicates in badchannel list, defining macro for num counters in client side

* fix segfault when list from file is empty, 

* fix tests assertion for ctbconfig (adding message) for c++11

* fixed badchannels in m3server (clocking in trimming) 

* badchannel tests can be run from any folder (finds the file)
This commit is contained in:
Dhanya Thattil
2022-09-01 15:30:04 +02:00
committed by GitHub
parent 02322bb3c2
commit 7de6f157b5
36 changed files with 499 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
slsDetectorSoftware/tests/test-CmdProxy-gotthard2.cpp
View File

@ -731,18 +731,4 @@ TEST_CASE("confadc", "[.cmd]") {
}
}
TEST_CASE("badchannels", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
if (det_type == defs::GOTTHARD2) {
REQUIRE_THROWS(proxy.Call("badchannels", {}, -1, GET));
REQUIRE_NOTHROW(proxy.Call("badchannels", {"/tmp/bla.txt"}, -1, GET));
REQUIRE_NOTHROW(proxy.Call("badchannels", {"/tmp/bla.txt"}, -1, PUT));
} else {
REQUIRE_THROWS(proxy.Call("badchannels", {}, -1, GET));
}
}
} // namespace sls

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

@ -561,7 +561,7 @@ TEST_CASE("sync", "[.cmd]") {
proxy.Call("sync", {}, -1, GET, oss);
REQUIRE(oss.str() == "sync 1\n");
}
det.getSynchronization(prev_val);
det.setSynchronization(prev_val);
} else {
REQUIRE_THROWS(proxy.Call("sync", {}, -1, GET));
REQUIRE_THROWS(proxy.Call("sync", {"0"}, -1, PUT));

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

@ -3,6 +3,7 @@
#include "CmdProxy.h"
#include "catch.hpp"
#include "sls/Detector.h"
#include "sls/file_utils.h"
#include "sls/sls_detector_defs.h"
#include <chrono>
@ -622,6 +623,29 @@ TEST_CASE("master", "[.cmd]") {
}
}
TEST_CASE("badchannels", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
if (det_type == defs::GOTTHARD2 || det_type == defs::MYTHEN3) {
REQUIRE_THROWS(proxy.Call("badchannels", {}, -1, GET));
std::string fname_put =
getAbsolutePathFromCurrentProcess(TEST_FILE_NAME_BAD_CHANNELS);
std::string fname_get = "/tmp/sls_test_channels.txt";
REQUIRE_NOTHROW(proxy.Call("badchannels", {fname_put}, 0, PUT));
REQUIRE_NOTHROW(proxy.Call("badchannels", {fname_get}, 0, GET));
auto list = getChannelsFromFile(fname_get);
std::vector<int> expected = {0, 12, 15, 40, 41, 42, 43, 44, 1279};
REQUIRE(list == expected);
} else {
REQUIRE_THROWS(proxy.Call("badchannels", {}, -1, GET));
}
}
/* acquisition parameters */
// acquire: not testing

3
slsDetectorSoftware/tests/test-CtbConfig.cpp
View File

@ -10,7 +10,8 @@
namespace sls {
TEST_CASE("Default construction") {
static_assert(sizeof(CtbConfig) == 360); // 18*20
static_assert(sizeof(CtbConfig) == 360,
"Size of CtbConfig does not match"); // 18*20
CtbConfig c;
auto names = c.getDacNames();