detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-05-15 13:35:35 +02:00
Code Issues Actions Packages Releases Activity

not allowing power names for dac names to prevent duplicate names

Browse Source
This commit is contained in:
maliakal_d
2026-02-24 10:58:36 +01:00
parent 8f07d2a464
commit ec787ca931
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
slsDetectorSoftware/src/CtbConfig.cpp
+7
View File
@@ -80,6 +80,13 @@ CtbConfig::getNames(size_t expected_size,
void CtbConfig::setDacName(size_t index, const std::string &name) {
check_index(index, num_dacs, "DAC");
std::vector<std::string> powers = {"v_a", "v_b", "v_c", "v_d", "v_io", "va", "vb", "vc", "vd", "vio"};
std::string lower = name;
std::transform(lower.begin(), lower.end(), lower.begin(),
[](unsigned char c){ return std::tolower(c); });
if (std::find(powers.begin(), powers.end(), lower) != powers.end()) {
throw RuntimeError("DAC name cannot be a power name (VA, VB, VC, VD, VIO, V_A, V_B, V_C, V_D, V_IO)");
}
set_name(name, dacnames, index);
}
slsDetectorSoftware/tests/Caller/test-Caller-chiptestboard.cpp
+5
View File
@@ -46,6 +46,11 @@ TEST_CASE("dacname", "[.detectorintegration]") {
REQUIRE(oss.str() ==
std::string("dacname ") + str_dac_index + " bname\n");
}
REQUIRE_THROWS(caller.call("dacname", {str_dac_index, "v_a"}, -1, PUT));
REQUIRE_THROWS(caller.call("dacname", {str_dac_index, "v_b"}, -1, PUT));
REQUIRE_THROWS(caller.call("dacname", {str_dac_index, "v_c"}, -1, PUT));
REQUIRE_THROWS(caller.call("dacname", {str_dac_index, "v_d"}, -1, PUT));
REQUIRE_THROWS(caller.call("dacname", {str_dac_index, "v_io"}, -1, PUT));
det.setDacName(ind, prev);
} else {