mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-12 21:07:13 +02:00
Counters (#71)
* mythen3: adding counters mask, firmware still takes only number of counters for now * mythen3: checking if module attached before powering on chip * bug fix: loop inital declaration not allowed in c * fix scope eiger test * mythen3: renamed setCounters to setCounterMask and getCounterMask in API * mythen3 replacing counting bits with popcount Co-authored-by: Erik Fröjdh <erik.frojdh@gmail.com>
This commit is contained in:
Dhanya Thattil
committed by
Erik Fröjdh
Erik Fröjdh
parent
70c54f4315
commit
de53747ddd
@ -153,311 +153,7 @@ TEST_CASE("type", "[.cmd]"){
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("daclist", GET));
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("dacvalues", GET));
|
||||
// int prev_val = 0;
|
||||
// if (test::type == slsDetectorDefs::EIGER) {
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vthreshold", GET,
|
||||
// nullptr, oss)); std::string s = (oss.str()).erase (0,
|
||||
// strlen("vthreshold ")); prev_val = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vthreshold 1000", PUT));
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vthreshold", GET,
|
||||
// nullptr, oss)); REQUIRE(oss.str() == "vthreshold 1000\n");
|
||||
// }
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcmp_ll", GET, nullptr,
|
||||
// oss)); REQUIRE(oss.str() == "vcmp_ll 1000\n");
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vthreshold " +
|
||||
// std::to_string(prev_val), PUT));
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vsvp", GET, nullptr,
|
||||
// oss)); std::string s = (oss.str()).erase (0, strlen("vsvp "));
|
||||
// prev_val = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vsvp 1000", PUT));
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vsvp", GET, nullptr,
|
||||
// oss)); REQUIRE(oss.str() == "vsvp 1000\n");
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vsvp " +
|
||||
// std::to_string(prev_val), PUT));
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vsvn", GET, nullptr,
|
||||
// oss)); std::string s = (oss.str()).erase (0, strlen("vsvn "));
|
||||
// prev_val = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vsvn 1000", PUT));
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vsvn", GET, nullptr,
|
||||
// oss)); REQUIRE(oss.str() == "vsvn 1000\n");
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vsvn " +
|
||||
// std::to_string(prev_val), PUT));
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vtr", GET, nullptr,
|
||||
// oss)); std::string s = (oss.str()).erase (0, strlen("vtr "));
|
||||
// prev_val = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vtr 1000", PUT));
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vtr", GET, nullptr,
|
||||
// oss)); REQUIRE(oss.str() == "vtr 1000\n");
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vtr " +
|
||||
// std::to_string(prev_val), PUT));
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vrf", GET, nullptr,
|
||||
// oss)); std::string s = (oss.str()).erase (0, strlen("vrf "));
|
||||
// prev_val = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vrf 1000", PUT));
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vrf", GET, nullptr,
|
||||
// oss)); REQUIRE(oss.str() == "vrf 1000\n");
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vrf " +
|
||||
// std::to_string(prev_val), PUT));
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vrs", GET, nullptr,
|
||||
// oss)); std::string s = (oss.str()).erase (0, strlen("vrs "));
|
||||
// prev_val = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vrs 1000", PUT));
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vrs", GET, nullptr,
|
||||
// oss)); REQUIRE(oss.str() == "vrs 1000\n");
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vrs " +
|
||||
// std::to_string(prev_val), PUT));
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vtgstv", GET, nullptr,
|
||||
// oss)); std::string s = (oss.str()).erase (0, strlen("vtgstv "));
|
||||
// prev_val = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vtgstv 1000", PUT));
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vtgstv", GET, nullptr,
|
||||
// oss)); REQUIRE(oss.str() == "vtgstv 1000\n");
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vtgstv " +
|
||||
// std::to_string(prev_val), PUT));
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcmp_ll", GET, nullptr,
|
||||
// oss)); std::string s = (oss.str()).erase (0, strlen("vcmp_ll "));
|
||||
// prev_val = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcmp_ll 1000", PUT));
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcmp_ll", GET, nullptr,
|
||||
// oss)); REQUIRE(oss.str() == "vcmp_ll 1000\n");
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcmp_ll " +
|
||||
// std::to_string(prev_val), PUT));
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcmp_lr", GET, nullptr,
|
||||
// oss)); std::string s = (oss.str()).erase (0, strlen("vcmp_lr "));
|
||||
// prev_val = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcmp_lr 1000", PUT));
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcmp_lr", GET, nullptr,
|
||||
// oss)); REQUIRE(oss.str() == "vcmp_lr 1000\n");
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcmp_lr " +
|
||||
// std::to_string(prev_val), PUT));
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcal", GET, nullptr,
|
||||
// oss)); std::string s = (oss.str()).erase (0, strlen("vcal "));
|
||||
// prev_val = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcal 1000", PUT));
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcal", GET, nullptr,
|
||||
// oss)); REQUIRE(oss.str() == "vcal 1000\n");
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcal " +
|
||||
// std::to_string(prev_val), PUT));
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcmp_rl", GET, nullptr,
|
||||
// oss)); std::string s = (oss.str()).erase (0, strlen("vcmp_rl "));
|
||||
// prev_val = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcmp_rl 1000", PUT));
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcmp_rl", GET, nullptr,
|
||||
// oss)); REQUIRE(oss.str() == "vcmp_rl 1000\n");
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcmp_rl " +
|
||||
// std::to_string(prev_val), PUT));
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcmp_rr", GET, nullptr,
|
||||
// oss)); std::string s = (oss.str()).erase (0, strlen("vcmp_rr "));
|
||||
// prev_val = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcmp_rr 1000", PUT));
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcmp_rr", GET, nullptr,
|
||||
// oss)); REQUIRE(oss.str() == "vcmp_rr 1000\n");
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcmp_rr " +
|
||||
// std::to_string(prev_val), PUT));
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("rxb_rb", GET, nullptr,
|
||||
// oss)); std::string s = (oss.str()).erase (0, strlen("rxb_rb "));
|
||||
// prev_val = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("rxb_rb 1000", PUT));
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("rxb_rb", GET, nullptr,
|
||||
// oss)); REQUIRE(oss.str() == "rxb_rb 1000\n");
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("rxb_rb " +
|
||||
// std::to_string(prev_val), PUT));
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("rxb_lb", GET, nullptr,
|
||||
// oss)); std::string s = (oss.str()).erase (0, strlen("rxb_lb "));
|
||||
// prev_val = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("rxb_lb 1000", PUT));
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("rxb_lb", GET, nullptr,
|
||||
// oss)); REQUIRE(oss.str() == "rxb_lb 1000\n");
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("rxb_lb " +
|
||||
// std::to_string(prev_val), PUT));
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcp", GET, nullptr,
|
||||
// oss)); std::string s = (oss.str()).erase (0, strlen("vcp "));
|
||||
// prev_val = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcp 1000", PUT));
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcp", GET, nullptr,
|
||||
// oss)); REQUIRE(oss.str() == "vcp 1000\n");
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcp " +
|
||||
// std::to_string(prev_val), PUT));
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcn", GET, nullptr,
|
||||
// oss)); std::string s = (oss.str()).erase (0, strlen("vcn "));
|
||||
// prev_val = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcn 1000", PUT));
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcn", GET, nullptr,
|
||||
// oss)); REQUIRE(oss.str() == "vcn 1000\n");
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcn " +
|
||||
// std::to_string(prev_val), PUT));
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vis", GET, nullptr,
|
||||
// oss)); std::string s = (oss.str()).erase (0, strlen("vis "));
|
||||
// prev_val = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vis 1000", PUT));
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vis", GET, nullptr,
|
||||
// oss)); REQUIRE(oss.str() == "vis 1000\n");
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vis " +
|
||||
// std::to_string(prev_val), PUT));
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("iodelay", GET, nullptr,
|
||||
// oss)); std::string s = (oss.str()).erase (0, strlen("iodelay "));
|
||||
// prev_val = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("iodelay 1000", PUT));
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("iodelay", GET, nullptr,
|
||||
// oss)); REQUIRE(oss.str() == "iodelay 1000\n");
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("iodelay " +
|
||||
// std::to_string(prev_val), PUT));
|
||||
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vref_ds", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vcascn_pb", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vcascp_pb", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vout_cm", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vcasc_out", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vin_cm", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vref_comp", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("ib_test_c", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vpreamp", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vshaper", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vshaperneg", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vipre", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("viinsh", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vdcsh", GET));
|
||||
// // REQUIRE_THROWS(multiSlsDetectorClient("vth1", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vth2", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vth3", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vpl", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vph", GET));
|
||||
// //REQUIRE_THROWS(multiSlsDetectorClient("vtrim", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vcassh", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vcas", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vicin", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vipre_out", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vref_h_adc", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vb_comp_fe", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vb_comp_adc", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vcom_cds", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vref_restore", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vb_opa_1st", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vref_comp_fe", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vcom_adc1", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vref_l_adc", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vref_cds", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vb_cs", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vb_opa_fd", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vcom_adc2", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vb_ds", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vb_comp", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vb_pixbuf", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vin_com", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vdd_prot", GET));
|
||||
|
||||
// }
|
||||
|
||||
// else if (test::type == slsDetectorDefs::JUNGFRAU) {
|
||||
// if (test::type == slsDetectorDefs::JUNGFRAU) {
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vb_ds", GET, nullptr,
|
||||
@ -878,291 +574,6 @@ TEST_CASE("type", "[.cmd]"){
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vdd_prot", GET));
|
||||
// }
|
||||
|
||||
// else if (test::type == slsDetectorDefs::MYTHEN3) {
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vthreshold", GET,
|
||||
// nullptr, oss)); std::string s = (oss.str()).erase (0,
|
||||
// strlen("vthreshold ")); prev_val = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vthreshold 1000 mv",
|
||||
// PUT)); std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vthreshold mv", GET,
|
||||
// nullptr, oss)); REQUIRE(oss.str() == "vthreshold 1000 mv\n");
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vthreshold " +
|
||||
// std::to_string(prev_val), PUT));
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vpreamp", GET, nullptr,
|
||||
// oss)); std::string s = (oss.str()).erase (0, strlen("vpreamp "));
|
||||
// prev_val = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vpreamp 1000", PUT));
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vpreamp", GET, nullptr,
|
||||
// oss)); REQUIRE(oss.str() == "vpreamp 1000\n");
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vpreamp " +
|
||||
// std::to_string(prev_val), PUT));
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vshaper", GET, nullptr,
|
||||
// oss)); std::string s = (oss.str()).erase (0, strlen("vshaper "));
|
||||
// prev_val = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vshaper 1000", PUT));
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vshaper", GET, nullptr,
|
||||
// oss)); REQUIRE(oss.str() == "vshaper 1000\n");
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vshaper " +
|
||||
// std::to_string(prev_val), PUT));
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vshaperneg", GET,
|
||||
// nullptr, oss)); std::string s = (oss.str()).erase (0,
|
||||
// strlen("vshaperneg ")); prev_val = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vshaperneg 1000", PUT));
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vshaperneg", GET,
|
||||
// nullptr, oss)); REQUIRE(oss.str() == "vshaperneg 1000\n");
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vshaperneg " +
|
||||
// std::to_string(prev_val), PUT));
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vipre", GET, nullptr,
|
||||
// oss)); std::string s = (oss.str()).erase (0, strlen("vipre "));
|
||||
// prev_val = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vipre 1000", PUT));
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vipre", GET, nullptr,
|
||||
// oss)); REQUIRE(oss.str() == "vipre 1000\n");
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vipre " +
|
||||
// std::to_string(prev_val), PUT));
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("viinsh", GET, nullptr,
|
||||
// oss)); std::string s = (oss.str()).erase (0, strlen("viinsh "));
|
||||
// prev_val = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("viinsh 1000", PUT));
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("viinsh", GET, nullptr,
|
||||
// oss)); REQUIRE(oss.str() == "viinsh 1000\n");
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("viinsh " +
|
||||
// std::to_string(prev_val), PUT));
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vdcsh", GET, nullptr,
|
||||
// oss)); std::string s = (oss.str()).erase (0, strlen("vdcsh "));
|
||||
// prev_val = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vdcsh 1000", PUT));
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vdcsh", GET, nullptr,
|
||||
// oss)); REQUIRE(oss.str() == "vdcsh 1000\n");
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vdcsh " +
|
||||
// std::to_string(prev_val), PUT));
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vth1", GET, nullptr,
|
||||
// oss)); std::string s = (oss.str()).erase (0, strlen("vth1 "));
|
||||
// prev_val = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vth1 1000", PUT));
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vth1", GET, nullptr,
|
||||
// oss)); REQUIRE(oss.str() == "vth1 1000\n");
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vth1 " +
|
||||
// std::to_string(prev_val), PUT));
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vth2", GET, nullptr,
|
||||
// oss)); std::string s = (oss.str()).erase (0, strlen("vth2 "));
|
||||
// prev_val = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vth2 1000", PUT));
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vth2", GET, nullptr,
|
||||
// oss)); REQUIRE(oss.str() == "vth2 1000\n");
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vth2 " +
|
||||
// std::to_string(prev_val), PUT));
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vth3", GET, nullptr,
|
||||
// oss)); std::string s = (oss.str()).erase (0, strlen("vth3 "));
|
||||
// prev_val = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vth3 1000", PUT));
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vth3", GET, nullptr,
|
||||
// oss)); REQUIRE(oss.str() == "vth3 1000\n");
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vth3 " +
|
||||
// std::to_string(prev_val), PUT));
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vpl", GET, nullptr,
|
||||
// oss)); std::string s = (oss.str()).erase (0, strlen("vpl "));
|
||||
// prev_val = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vpl 1000", PUT));
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vpl", GET, nullptr,
|
||||
// oss)); REQUIRE(oss.str() == "vpl 1000\n");
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vpl " +
|
||||
// std::to_string(prev_val), PUT));
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vph", GET, nullptr,
|
||||
// oss)); std::string s = (oss.str()).erase (0, strlen("vph "));
|
||||
// prev_val = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vph 1000", PUT));
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vph", GET, nullptr,
|
||||
// oss)); REQUIRE(oss.str() == "vph 1000\n");
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vph " +
|
||||
// std::to_string(prev_val), PUT));
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vtrim", GET, nullptr,
|
||||
// oss)); std::string s = (oss.str()).erase (0, strlen("vtrim "));
|
||||
// prev_val = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vtrim 1000", PUT));
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vtrim", GET, nullptr,
|
||||
// oss)); REQUIRE(oss.str() == "vtrim 1000\n");
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vtrim " +
|
||||
// std::to_string(prev_val), PUT));
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcassh", GET, nullptr,
|
||||
// oss)); std::string s = (oss.str()).erase (0, strlen("vcassh "));
|
||||
// prev_val = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcassh 1000", PUT));
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcassh", GET, nullptr,
|
||||
// oss)); REQUIRE(oss.str() == "vcassh 1000\n");
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcassh " +
|
||||
// std::to_string(prev_val), PUT));
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcas", GET, nullptr,
|
||||
// oss)); std::string s = (oss.str()).erase (0, strlen("vcas "));
|
||||
// prev_val = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcas 1000", PUT));
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcas", GET, nullptr,
|
||||
// oss)); REQUIRE(oss.str() == "vcas 1000\n");
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vcas " +
|
||||
// std::to_string(prev_val), PUT));
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vicin", GET, nullptr,
|
||||
// oss)); std::string s = (oss.str()).erase (0, strlen("vicin "));
|
||||
// prev_val = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vicin 1000", PUT));
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vicin", GET, nullptr,
|
||||
// oss)); REQUIRE(oss.str() == "vicin 1000\n");
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vicin " +
|
||||
// std::to_string(prev_val), PUT));
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vipre_out", GET, nullptr,
|
||||
// oss)); std::string s = (oss.str()).erase (0, strlen("vipre_out
|
||||
// ")); prev_val = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vipre_out 1000", PUT));
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vipre_out", GET, nullptr,
|
||||
// oss)); REQUIRE(oss.str() == "vipre_out 1000\n");
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("vipre_out " +
|
||||
// std::to_string(prev_val), PUT));
|
||||
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vsvp", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vsvn", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vtr", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vrf", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vrs", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vtgstv", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vcmp_ll", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vcmp_lr", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vcal", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vcmp_rl", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vcmp_rr", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("rxb_rb", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("rxb_lb", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vcp", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vcn", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vis", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("iodelay", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vref_ds", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vcascn_pb", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vcascp_pb", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vout_cm", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vcasc_out", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vin_cm", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vref_comp", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("ib_test_c", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vref_h_adc", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vb_comp_fe", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vb_comp_adc", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vcom_cds", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vref_restore", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vb_opa_1st", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vref_comp_fe", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vcom_adc1", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vref_prech", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vref_l_adc", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vref_cds", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vb_cs", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vb_opa_fd", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vcom_adc2", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vb_ds", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vb_comp", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vb_pixbuf", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vin_com", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("vdd_prot", GET));
|
||||
// }
|
||||
|
||||
// else if (test::type == slsDetectorDefs::GOTTHARD2) {
|
||||
// {
|
||||
@ -3896,63 +3307,7 @@ TEST_CASE("firmwareversion", "[.cmd]") {
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("delay 0", PUT));
|
||||
// }
|
||||
// }
|
||||
// TEST_CASE("clk", "[.cmd][.gotthard2][.mythen3]") {
|
||||
// if(test::type == slsDetectorDefs::GOTTHARD2 || test::type ==
|
||||
// slsDetectorDefs::MYTHEN3) {
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("clkfreq 0 2", PUT)); // cannot
|
||||
// get REQUIRE_THROWS(multiSlsDetectorClient("clkfreq", GET)); //
|
||||
// requires clk index REQUIRE_THROWS(multiSlsDetectorClient("clkfreq 7",
|
||||
// GET)); // 7 doesnt exist
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("clkfreq 4", PUT)); // requires
|
||||
// clk index and val REQUIRE_THROWS(multiSlsDetectorClient("clkfreq 7
|
||||
// 4", PUT)); // 7 doesnt exist
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("clkphase", GET)); // requires
|
||||
// clk index REQUIRE_THROWS(multiSlsDetectorClient("clkphase 7", GET));
|
||||
// // 7 doesnt exist REQUIRE_THROWS(multiSlsDetectorClient("clkphase 4",
|
||||
// PUT)); // requires clk index and val
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("clkphase 7 4", PUT)); // 7
|
||||
// doesnt exist REQUIRE_THROWS(multiSlsDetectorClient("clkdiv", GET));
|
||||
// // requires clk index REQUIRE_THROWS(multiSlsDetectorClient("clkdiv
|
||||
// 7", GET)); // 7 doesnt exist
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("clkdiv 4", PUT)); // requires
|
||||
// clk index and val REQUIRE_THROWS(multiSlsDetectorClient("clkdiv 7 4",
|
||||
// PUT)); // 7 doesnt exist
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("maxclkphaseshift 7", GET)); //
|
||||
// 7 doesnt exist
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("maxclkphaseshift 7 4", PUT));
|
||||
// // cannot put
|
||||
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("maxclkphaseshift 0", GET));
|
||||
// int t = 0;
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("clkdiv 0", GET, nullptr,
|
||||
// oss)); std::string s = (oss.str()).erase (0, strlen("clkdiv "));
|
||||
// t = std::stoi(s);
|
||||
// }
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("clkdiv 0 " +
|
||||
// std::to_string(t), PUT, nullptr, oss)); REQUIRE(oss.str() ==
|
||||
// "clkdiv " + std::to_string(t) + '\n');
|
||||
// }
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("clkfreq 0", GET));
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("clkphase 1 20", PUT,
|
||||
// nullptr, oss)); REQUIRE(oss.str() == "clkphase 20\n");
|
||||
// }
|
||||
// {
|
||||
// std::ostringstream oss;
|
||||
// REQUIRE_NOTHROW(multiSlsDetectorClient("clkphase 1", GET,
|
||||
// nullptr, oss)); REQUIRE(oss.str() == "clkphase 20\n");
|
||||
// }
|
||||
// } else {
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("clkfreq 0", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("clkphase 0", GET));
|
||||
// REQUIRE_THROWS(multiSlsDetectorClient("clkdiv 0", GET));
|
||||
// }
|
||||
// }
|
||||
|
||||
TEST_CASE("frames", "[.cmd]") {
|
||||
Detector det;
|
||||
|
||||
Reference in New Issue
Block a user