detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-25 15:50:03 +02:00
Code Issues Actions Packages Releases Activity

replaced remaning {}

Browse Source
This commit is contained in:
Erik Frojdh 2020-09-17 12:18:08 +02:00
parent 1fb7352378
commit 5d648443fa
1 changed files with 113 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

226
slsDetectorSoftware/src/CmdProxy.cpp
View File

@ -128,7 +128,7 @@ std::string CmdProxy::Hostname(int action) {
if (!args.empty()) { if (!args.empty()) {
WrongNumberOfParameters(0); WrongNumberOfParameters(0);
} }
auto t = det->getHostname({det_id}); auto t = det->getHostname(std::vector<int>{det_id});
os << OutString(t) << '\n'; os << OutString(t) << '\n';
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
if (args.empty()) { if (args.empty()) {
@ -227,7 +227,7 @@ std::string CmdProxy::FirmwareVersion(int action) {
if (!args.empty()) { if (!args.empty()) {
WrongNumberOfParameters(0); WrongNumberOfParameters(0);
} }
auto t = det->getFirmwareVersion({det_id}); auto t = det->getFirmwareVersion(std::vector<int>{det_id});
if (det->getDetectorType().squash() == defs::EIGER) { if (det->getDetectorType().squash() == defs::EIGER) {
os << OutString(t) << '\n'; os << OutString(t) << '\n';
} else { } else {
@ -488,7 +488,7 @@ std::string CmdProxy::DynamicRange(int action) {
if (!args.empty()) { if (!args.empty()) {
WrongNumberOfParameters(0); WrongNumberOfParameters(0);
} }
auto t = det->getDynamicRange({det_id}); auto t = det->getDynamicRange(std::vector<int>{det_id});
os << OutString(t) << '\n'; os << OutString(t) << '\n';
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
if (det_id != -1) { if (det_id != -1) {
@ -531,7 +531,7 @@ std::string CmdProxy::Speed(int action) {
if (!args.empty()) { if (!args.empty()) {
WrongNumberOfParameters(0); WrongNumberOfParameters(0);
} }
auto t = det->getSpeed({det_id}); auto t = det->getSpeed(std::vector<int>{det_id});
os << OutString(t) << '\n'; os << OutString(t) << '\n';
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
if (args.size() != 1) { if (args.size() != 1) {
@ -556,7 +556,7 @@ std::string CmdProxy::Speed(int action) {
} catch (...) { } catch (...) {
t = sls::StringTo<defs::speedLevel>(args[0]); t = sls::StringTo<defs::speedLevel>(args[0]);
} }
det->setSpeed(t, {det_id}); det->setSpeed(t, std::vector<int>{det_id});
os << sls::ToString(t) << '\n'; // no args to convert 0,1,2 as well os << sls::ToString(t) << '\n'; // no args to convert 0,1,2 as well
} else { } else {
throw sls::RuntimeError("Unknown action"); throw sls::RuntimeError("Unknown action");
@ -588,7 +588,7 @@ std::string CmdProxy::Adcphase(int action) {
if (action == defs::GET_ACTION) { if (action == defs::GET_ACTION) {
Result<int> t; Result<int> t;
if (args.empty()) { if (args.empty()) {
t = det->getADCPhase({det_id}); t = det->getADCPhase(std::vector<int>{det_id});
os << OutString(t) << '\n'; os << OutString(t) << '\n';
} else if (args.size() == 1) { } else if (args.size() == 1) {
if (args[0] != "deg") { if (args[0] != "deg") {
@ -596,21 +596,21 @@ std::string CmdProxy::Adcphase(int action) {
args[0] + args[0] +
". Did you mean deg? "); ". Did you mean deg? ");
} }
t = det->getADCPhaseInDegrees({det_id}); t = det->getADCPhaseInDegrees(std::vector<int>{det_id});
os << OutString(t) << " deg\n"; os << OutString(t) << " deg\n";
} else { } else {
WrongNumberOfParameters(0); WrongNumberOfParameters(0);
} }
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
if (args.size() == 1) { if (args.size() == 1) {
det->setADCPhase(StringTo<int>(args[0]), {det_id}); det->setADCPhase(StringTo<int>(args[0]), std::vector<int>{det_id});
os << args.front() << '\n'; os << args.front() << '\n';
} else if (args.size() == 2) { } else if (args.size() == 2) {
if (args[1] != "deg") { if (args[1] != "deg") {
throw sls::RuntimeError("Unknown adcphase 2nd argument " + throw sls::RuntimeError("Unknown adcphase 2nd argument " +
args[1] + ". Did you mean deg?"); args[1] + ". Did you mean deg?");
} }
det->setADCPhaseInDegrees(StringTo<int>(args[0]), {det_id}); det->setADCPhaseInDegrees(StringTo<int>(args[0]), std::vector<int>{det_id});
os << args[0] << " " << args[1] << '\n'; os << args[0] << " " << args[1] << '\n';
} else { } else {
WrongNumberOfParameters(1); WrongNumberOfParameters(1);
@ -641,28 +641,28 @@ std::string CmdProxy::Dbitphase(int action) {
if (action == defs::GET_ACTION) { if (action == defs::GET_ACTION) {
Result<int> t; Result<int> t;
if (args.empty()) { if (args.empty()) {
t = det->getDBITPhase({det_id}); t = det->getDBITPhase(std::vector<int>{det_id});
os << OutString(t) << '\n'; os << OutString(t) << '\n';
} else if (args.size() == 1) { } else if (args.size() == 1) {
if (args[0] != "deg") { if (args[0] != "deg") {
throw sls::RuntimeError("Unknown dbitphase argument " + throw sls::RuntimeError("Unknown dbitphase argument " +
args[0] + ". Did you mean deg? "); args[0] + ". Did you mean deg? ");
} }
t = det->getDBITPhaseInDegrees({det_id}); t = det->getDBITPhaseInDegrees(std::vector<int>{det_id});
os << OutString(t) << " deg\n"; os << OutString(t) << " deg\n";
} else { } else {
WrongNumberOfParameters(0); WrongNumberOfParameters(0);
} }
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
if (args.size() == 1) { if (args.size() == 1) {
det->setDBITPhase(StringTo<int>(args[0]), {det_id}); det->setDBITPhase(StringTo<int>(args[0]), std::vector<int>{det_id});
os << args.front() << '\n'; os << args.front() << '\n';
} else if (args.size() == 2) { } else if (args.size() == 2) {
if (args[1] != "deg") { if (args[1] != "deg") {
throw sls::RuntimeError("Unknown dbitphase 2nd argument " + throw sls::RuntimeError("Unknown dbitphase 2nd argument " +
args[1] + ". Did you mean deg? "); args[1] + ". Did you mean deg? ");
} }
det->setDBITPhaseInDegrees(StringTo<int>(args[0]), {det_id}); det->setDBITPhaseInDegrees(StringTo<int>(args[0]), std::vector<int>{det_id});
os << args[0] << " " << args[1] << '\n'; os << args[0] << " " << args[1] << '\n';
} else { } else {
WrongNumberOfParameters(1); WrongNumberOfParameters(1);
@ -691,14 +691,14 @@ std::string CmdProxy::ClockFrequency(int action) {
if (args.size() != 1) { if (args.size() != 1) {
WrongNumberOfParameters(1); WrongNumberOfParameters(1);
} }
auto t = det->getClockFrequency(StringTo<int>(args[0]), {det_id}); auto t = det->getClockFrequency(StringTo<int>(args[0]), std::vector<int>{det_id});
os << OutString(t) << '\n'; os << 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);
} }
det->setClockFrequency(StringTo<int>(args[0]), det->setClockFrequency(StringTo<int>(args[0]),
StringTo<int>(args[1]), {det_id}); StringTo<int>(args[1]), std::vector<int>{det_id});
os << StringTo<int>(args[1]) << '\n'; os << StringTo<int>(args[1]) << '\n';
} else { } else {
throw sls::RuntimeError("Unknown action"); throw sls::RuntimeError("Unknown action");
@ -724,7 +724,7 @@ std::string CmdProxy::ClockPhase(int action) {
} }
if (action == defs::GET_ACTION) { if (action == defs::GET_ACTION) {
if (args.size() == 1) { if (args.size() == 1) {
auto t = det->getClockPhase(StringTo<int>(args[0]), {det_id}); auto t = det->getClockPhase(StringTo<int>(args[0]), std::vector<int>{det_id});
os << OutString(t) << '\n'; os << OutString(t) << '\n';
} else if (args.size() == 2) { } else if (args.size() == 2) {
if (args[1] != "deg") { if (args[1] != "deg") {
@ -740,7 +740,7 @@ std::string CmdProxy::ClockPhase(int action) {
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
if (args.size() == 2) { if (args.size() == 2) {
det->setClockPhase(StringTo<int>(args[0]), det->setClockPhase(StringTo<int>(args[0]),
StringTo<int>(args[1]), {det_id}); StringTo<int>(args[1]), std::vector<int>{det_id});
os << args[1] << '\n'; os << args[1] << '\n';
} else if (args.size() == 3) { } else if (args.size() == 3) {
if (args[2] != "deg") { if (args[2] != "deg") {
@ -748,7 +748,7 @@ std::string CmdProxy::ClockPhase(int action) {
". Did you mean deg?"); ". Did you mean deg?");
} }
det->setClockPhaseinDegrees(StringTo<int>(args[0]), det->setClockPhaseinDegrees(StringTo<int>(args[0]),
StringTo<int>(args[1]), {det_id}); StringTo<int>(args[1]), std::vector<int>{det_id});
os << args[1] << " " << args[2] << '\n'; os << args[1] << " " << args[2] << '\n';
} else { } else {
WrongNumberOfParameters(1); WrongNumberOfParameters(1);
@ -778,7 +778,7 @@ std::string CmdProxy::MaxClockPhaseShift(int action) {
WrongNumberOfParameters(1); WrongNumberOfParameters(1);
} }
auto t = auto t =
det->getMaxClockPhaseShift(StringTo<int>(args[0]), {det_id}); det->getMaxClockPhaseShift(StringTo<int>(args[0]), std::vector<int>{det_id});
os << OutString(t) << '\n'; os << OutString(t) << '\n';
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
throw sls::RuntimeError("Cannot put"); throw sls::RuntimeError("Cannot put");
@ -806,7 +806,7 @@ std::string CmdProxy::ClockDivider(int action) {
if (args.size() != 1) { if (args.size() != 1) {
WrongNumberOfParameters(1); WrongNumberOfParameters(1);
} }
auto t = det->getClockDivider(StringTo<int>(args[0]), {det_id}); auto t = det->getClockDivider(StringTo<int>(args[0]), std::vector<int>{det_id});
os << OutString(t) << '\n'; os << OutString(t) << '\n';
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
if (args.size() != 2) { if (args.size() != 2) {
@ -840,7 +840,7 @@ std::string CmdProxy::ExternalSignal(int action) {
if (args.size() != 1) { if (args.size() != 1) {
WrongNumberOfParameters(1); WrongNumberOfParameters(1);
} }
auto t = det->getExternalSignalFlags(StringTo<int>(args[0]), {det_id}); auto t = det->getExternalSignalFlags(StringTo<int>(args[0]), std::vector<int>{det_id});
os << args[0] << " " << 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) {
@ -848,7 +848,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]), std::vector<int>{det_id});
os << args[0] << " " << args[1] << '\n'; os << args[0] << " " << args[1] << '\n';
} else { } else {
throw sls::RuntimeError("Unknown action"); throw sls::RuntimeError("Unknown action");
@ -872,10 +872,10 @@ std::string CmdProxy::TemperatureValues(int action) {
if (t.size() > 0) { if (t.size() > 0) {
auto it = t.cbegin(); auto it = t.cbegin();
os << ToString(*it) << ' '; os << ToString(*it) << ' ';
os << OutString(det->getTemperature(*it++, {det_id})) << " °C"; os << OutString(det->getTemperature(*it++, std::vector<int>{det_id})) << " °C";
while (it != t.cend()) { while (it != t.cend()) {
os << ", " << ToString(*it) << ' '; os << ", " << ToString(*it) << ' ';
os << OutString(det->getTemperature(*it++, {det_id})) << " °C"; os << OutString(det->getTemperature(*it++, std::vector<int>{det_id})) << " °C";
} }
} }
os << "]\n"; os << "]\n";
@ -912,7 +912,7 @@ std::string CmdProxy::Dac(int action) {
WrongNumberOfParameters(1); WrongNumberOfParameters(1);
} }
auto t = det->getDAC( auto t = det->getDAC(
static_cast<defs::dacIndex>(StringTo<int>(args[0])), mv, {det_id}); static_cast<defs::dacIndex>(StringTo<int>(args[0])), mv, std::vector<int>{det_id});
os << args[0] << ' ' << OutString(t) os << args[0] << ' ' << OutString(t)
<< (args.size() > 1 ? " mV\n" : "\n"); << (args.size() > 1 ? " mV\n" : "\n");
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
@ -927,7 +927,7 @@ std::string CmdProxy::Dac(int action) {
WrongNumberOfParameters(2); WrongNumberOfParameters(2);
} }
det->setDAC(static_cast<defs::dacIndex>(StringTo<int>(args[0])), det->setDAC(static_cast<defs::dacIndex>(StringTo<int>(args[0])),
StringTo<int>(args[1]), mv, {det_id}); StringTo<int>(args[1]), mv, std::vector<int>{det_id});
os << args[0] << ' ' << args[1] << (args.size() > 2 ? " mV\n" : "\n"); os << args[0] << ' ' << args[1] << (args.size() > 2 ? " mV\n" : "\n");
} else { } else {
throw sls::RuntimeError("Unknown action"); throw sls::RuntimeError("Unknown action");
@ -957,11 +957,11 @@ std::string CmdProxy::DacValues(int action) {
os << '['; os << '[';
auto it = t.cbegin(); auto it = t.cbegin();
os << ToString(*it) << ' '; os << ToString(*it) << ' ';
os << OutString(det->getDAC(*it++, mv, {det_id})) os << OutString(det->getDAC(*it++, mv, std::vector<int>{det_id}))
<< (!args.empty() ? " mV" : ""); << (!args.empty() ? " mV" : "");
while (it != t.cend()) { while (it != t.cend()) {
os << ", " << ToString(*it) << ' '; os << ", " << ToString(*it) << ' ';
os << OutString(det->getDAC(*it++, mv, {det_id})) os << OutString(det->getDAC(*it++, mv, std::vector<int>{det_id}))
<< (!args.empty() ? " mV" : ""); << (!args.empty() ? " mV" : "");
} }
os << "]\n"; os << "]\n";
@ -985,7 +985,7 @@ std::string CmdProxy::ReceiverStatus(int action) {
if (!args.empty()) { if (!args.empty()) {
WrongNumberOfParameters(0); WrongNumberOfParameters(0);
} }
auto t = det->getReceiverStatus({det_id}); auto t = det->getReceiverStatus(std::vector<int>{det_id});
os << OutString(t) << '\n'; os << OutString(t) << '\n';
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
throw sls::RuntimeError( throw sls::RuntimeError(
@ -1007,7 +1007,7 @@ std::string CmdProxy::DetectorStatus(int action) {
if (!args.empty()) { if (!args.empty()) {
WrongNumberOfParameters(0); WrongNumberOfParameters(0);
} }
auto t = det->getDetectorStatus({det_id}); auto t = det->getDetectorStatus(std::vector<int>{det_id});
os << OutString(t) << '\n'; os << OutString(t) << '\n';
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
throw sls::RuntimeError( throw sls::RuntimeError(
@ -1084,7 +1084,7 @@ std::string CmdProxy::UDPDestinationIP(int action) {
"rx_hostname." "rx_hostname."
<< '\n'; << '\n';
} else if (action == defs::GET_ACTION) { } else if (action == defs::GET_ACTION) {
auto t = det->getDestinationUDPIP({det_id}); auto t = det->getDestinationUDPIP(std::vector<int>{det_id});
if (!args.empty()) { if (!args.empty()) {
WrongNumberOfParameters(0); WrongNumberOfParameters(0);
} }
@ -1095,7 +1095,7 @@ std::string CmdProxy::UDPDestinationIP(int action) {
} }
if (args[0] == "auto") { if (args[0] == "auto") {
std::string rxHostname = std::string rxHostname =
det->getRxHostname({det_id}).squash("none"); det->getRxHostname(std::vector<int>{det_id}).squash("none");
// Hostname could be ip try to decode otherwise look up the hostname // Hostname could be ip try to decode otherwise look up the hostname
auto val = sls::IpAddr{rxHostname}; auto val = sls::IpAddr{rxHostname};
if (val == 0) { if (val == 0) {
@ -1103,11 +1103,11 @@ std::string CmdProxy::UDPDestinationIP(int action) {
} }
LOG(logINFO) << "Setting udp_dstip of detector " << det_id << " to " LOG(logINFO) << "Setting udp_dstip of detector " << det_id << " to "
<< val; << val;
det->setDestinationUDPIP(val, {det_id}); det->setDestinationUDPIP(val, std::vector<int>{det_id});
os << val << '\n'; os << val << '\n';
} else { } else {
auto val = IpAddr(args[0]); auto val = IpAddr(args[0]);
det->setDestinationUDPIP(val, {det_id}); det->setDestinationUDPIP(val, std::vector<int>{det_id});
os << args.front() << '\n'; os << args.front() << '\n';
} }
} else { } else {
@ -1126,7 +1126,7 @@ std::string CmdProxy::UDPDestinationIP2(int action) {
"\n\t[Gotthard2] veto debugging. " "\n\t[Gotthard2] veto debugging. "
<< '\n'; << '\n';
} else if (action == defs::GET_ACTION) { } else if (action == defs::GET_ACTION) {
auto t = det->getDestinationUDPIP2({det_id}); auto t = det->getDestinationUDPIP2(std::vector<int>{det_id});
if (!args.empty()) { if (!args.empty()) {
WrongNumberOfParameters(0); WrongNumberOfParameters(0);
} }
@ -1137,7 +1137,7 @@ std::string CmdProxy::UDPDestinationIP2(int action) {
} }
if (args[0] == "auto") { if (args[0] == "auto") {
std::string rxHostname = std::string rxHostname =
det->getRxHostname({det_id}).squash("none"); det->getRxHostname(std::vector<int>{det_id}).squash("none");
// Hostname could be ip try to decode otherwise look up the hostname // Hostname could be ip try to decode otherwise look up the hostname
auto val = sls::IpAddr{rxHostname}; auto val = sls::IpAddr{rxHostname};
if (val == 0) { if (val == 0) {
@ -1145,11 +1145,11 @@ std::string CmdProxy::UDPDestinationIP2(int action) {
} }
LOG(logINFO) << "Setting udp_dstip2 of detector " << det_id LOG(logINFO) << "Setting udp_dstip2 of detector " << det_id
<< " to " << val; << " to " << val;
det->setDestinationUDPIP2(val, {det_id}); det->setDestinationUDPIP2(val, std::vector<int>{det_id});
os << val << '\n'; os << val << '\n';
} else { } else {
auto val = IpAddr(args[0]); auto val = IpAddr(args[0]);
det->setDestinationUDPIP2(val, {det_id}); det->setDestinationUDPIP2(val, std::vector<int>{det_id});
os << args.front() << '\n'; os << args.front() << '\n';
} }
} else { } else {
@ -1177,7 +1177,7 @@ std::string CmdProxy::ReceiverHostname(int action) {
if (!args.empty()) { if (!args.empty()) {
WrongNumberOfParameters(0); WrongNumberOfParameters(0);
} }
auto t = det->getRxHostname({det_id}); auto t = det->getRxHostname(std::vector<int>{det_id});
os << OutString(t) << '\n'; os << OutString(t) << '\n';
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
if (args.size() < 1) { if (args.size() < 1) {
@ -1211,7 +1211,7 @@ std::string CmdProxy::ReceiverHostname(int action) {
} }
// single receiver // single receiver
else { else {
det->setRxHostname(args[0], {det_id}); det->setRxHostname(args[0], std::vector<int>{det_id});
os << ToString(args) << '\n'; os << ToString(args) << '\n';
} }
} }
@ -1237,13 +1237,13 @@ std::string CmdProxy::Threshold(int action) {
if (!args.empty()) { if (!args.empty()) {
WrongNumberOfParameters(0); WrongNumberOfParameters(0);
} }
auto t = det->getThresholdEnergy({det_id}); auto t = det->getThresholdEnergy(std::vector<int>{det_id});
os << OutString(t) << '\n'; os << OutString(t) << '\n';
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
if (args.size() == 1) { if (args.size() == 1) {
auto t = det->getSettings({det_id}).tsquash( auto t = det->getSettings(std::vector<int>{det_id}).tsquash(
"Inconsistent settings between detectors"); "Inconsistent settings between detectors");
det->setThresholdEnergy(StringTo<int>(args[0]), t, true, {det_id}); det->setThresholdEnergy(StringTo<int>(args[0]), t, true, std::vector<int>{det_id});
} else if (args.size() == 2) { } else if (args.size() == 2) {
det->setThresholdEnergy( det->setThresholdEnergy(
StringTo<int>(args[0]), StringTo<int>(args[0]),
@ -1271,14 +1271,14 @@ std::string CmdProxy::ThresholdNoTb(int action) {
throw sls::RuntimeError("cannot get"); throw sls::RuntimeError("cannot get");
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
if (args.size() == 1) { if (args.size() == 1) {
auto t = det->getSettings({det_id}).tsquash( auto t = det->getSettings(std::vector<int>{det_id}).tsquash(
"Inconsistent settings between detectors"); "Inconsistent settings between detectors");
det->setThresholdEnergy(StringTo<int>(args[0]), t, false, {det_id}); det->setThresholdEnergy(StringTo<int>(args[0]), t, false, std::vector<int>{det_id});
} else if (args.size() == 2) { } else if (args.size() == 2) {
det->setThresholdEnergy( det->setThresholdEnergy(
StringTo<int>(args[0]), StringTo<int>(args[0]),
sls::StringTo<slsDetectorDefs::detectorSettings>(args[1]), sls::StringTo<slsDetectorDefs::detectorSettings>(args[1]),
false, {det_id}); false, std::vector<int>{det_id});
} else { } else {
WrongNumberOfParameters(1); WrongNumberOfParameters(1);
} }
@ -1302,7 +1302,7 @@ std::string CmdProxy::TrimEnergies(int action) {
if (!args.empty()) { if (!args.empty()) {
WrongNumberOfParameters(0); WrongNumberOfParameters(0);
} }
auto t = det->getTrimEnergies({det_id}); auto t = det->getTrimEnergies(std::vector<int>{det_id});
os << OutString(t) << '\n'; os << OutString(t) << '\n';
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
std::vector<int> t(args.size()); std::vector<int> t(args.size());
@ -1311,7 +1311,7 @@ std::string CmdProxy::TrimEnergies(int action) {
t[i] = StringTo<int>(args[i]); t[i] = StringTo<int>(args[i]);
} }
} }
det->setTrimEnergies(t, {det_id}); det->setTrimEnergies(t, std::vector<int>{det_id});
os << sls::ToString(args) << '\n'; os << sls::ToString(args) << '\n';
} else { } else {
throw sls::RuntimeError("Unknown action"); throw sls::RuntimeError("Unknown action");
@ -1331,7 +1331,7 @@ std::string CmdProxy::RateCorrection(int action) {
if (!args.empty()) { if (!args.empty()) {
WrongNumberOfParameters(0); WrongNumberOfParameters(0);
} }
auto t = det->getRateCorrection({det_id}); auto t = det->getRateCorrection(std::vector<int>{det_id});
os << OutString(t) << '\n'; os << OutString(t) << '\n';
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
if (args.size() != 1) { if (args.size() != 1) {
@ -1339,12 +1339,12 @@ std::string CmdProxy::RateCorrection(int action) {
} }
int tau = StringTo<int>(args[0]); int tau = StringTo<int>(args[0]);
if (tau == -1) { if (tau == -1) {
det->setDefaultRateCorrection({det_id}); det->setDefaultRateCorrection(std::vector<int>{det_id});
auto t = det->getRateCorrection({det_id}); auto t = det->getRateCorrection(std::vector<int>{det_id});
os << OutString(t) << '\n'; os << OutString(t) << '\n';
} else { } else {
auto t = StringTo<time::ns>(args[0], "ns"); auto t = StringTo<time::ns>(args[0], "ns");
det->setRateCorrection(t, {det_id}); det->setRateCorrection(t, std::vector<int>{det_id});
os << args.front() << "ns\n"; os << args.front() << "ns\n";
} }
} else { } else {
@ -1365,8 +1365,8 @@ std::string CmdProxy::Activate(int action) {
if (!args.empty()) { if (!args.empty()) {
WrongNumberOfParameters(0); WrongNumberOfParameters(0);
} }
auto t = det->getActive({det_id}); auto t = det->getActive(std::vector<int>{det_id});
auto p = det->getRxPadDeactivatedMode({det_id}); auto p = det->getRxPadDeactivatedMode(std::vector<int>{det_id});
Result<std::string> pResult(p.size()); Result<std::string> pResult(p.size());
for (unsigned int i = 0; i < p.size(); ++i) { for (unsigned int i = 0; i < p.size(); ++i) {
pResult[i] = p[i] ? "padding" : "nopadding"; pResult[i] = p[i] ? "padding" : "nopadding";
@ -1377,7 +1377,7 @@ std::string CmdProxy::Activate(int action) {
WrongNumberOfParameters(2); WrongNumberOfParameters(2);
} }
int t = StringTo<int>(args[0]); int t = StringTo<int>(args[0]);
det->setActive(t, {det_id}); det->setActive(t, std::vector<int>{det_id});
os << args[0]; os << args[0];
if (args.size() == 2) { if (args.size() == 2) {
bool p = true; bool p = true;
@ -1387,7 +1387,7 @@ std::string CmdProxy::Activate(int action) {
throw sls::RuntimeError( throw sls::RuntimeError(
"Unknown argument for deactivated padding."); "Unknown argument for deactivated padding.");
} }
det->setRxPadDeactivatedMode(p, {det_id}); det->setRxPadDeactivatedMode(p, std::vector<int>{det_id});
os << ' ' << args[1]; os << ' ' << args[1];
} }
os << '\n'; os << '\n';
@ -1414,7 +1414,7 @@ std::string CmdProxy::PulsePixel(int action) {
defs::xy c; defs::xy c;
c.x = StringTo<int>(args[1]); c.x = StringTo<int>(args[1]);
c.y = StringTo<int>(args[2]); c.y = StringTo<int>(args[2]);
det->pulsePixel(n, c, {det_id}); det->pulsePixel(n, c, std::vector<int>{det_id});
os << sls::ToString(args) << '\n'; os << sls::ToString(args) << '\n';
} else { } else {
throw sls::RuntimeError("Unknown action"); throw sls::RuntimeError("Unknown action");
@ -1439,7 +1439,7 @@ std::string CmdProxy::PulsePixelAndMove(int action) {
defs::xy c; defs::xy c;
c.x = StringTo<int>(args[1]); c.x = StringTo<int>(args[1]);
c.y = StringTo<int>(args[2]); c.y = StringTo<int>(args[2]);
det->pulsePixelNMove(n, c, {det_id}); det->pulsePixelNMove(n, c, std::vector<int>{det_id});
os << sls::ToString(args) << '\n'; os << sls::ToString(args) << '\n';
} else { } else {
throw sls::RuntimeError("Unknown action"); throw sls::RuntimeError("Unknown action");
@ -1461,7 +1461,7 @@ std::string CmdProxy::PulseChip(int action) {
if (args.size() != 1) { if (args.size() != 1) {
WrongNumberOfParameters(1); WrongNumberOfParameters(1);
} }
det->pulseChip(StringTo<int>(args[0]), {det_id}); det->pulseChip(StringTo<int>(args[0]), std::vector<int>{det_id});
os << args.front() << '\n'; os << args.front() << '\n';
} else { } else {
throw sls::RuntimeError("Unknown action"); throw sls::RuntimeError("Unknown action");
@ -1480,7 +1480,7 @@ std::string CmdProxy::Quad(int action) {
if (!args.empty()) { if (!args.empty()) {
WrongNumberOfParameters(0); WrongNumberOfParameters(0);
} }
auto t = det->getQuad({det_id}); auto t = det->getQuad(std::vector<int>{det_id});
os << OutString(t) << '\n'; os << OutString(t) << '\n';
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
if (det_id != -1) { if (det_id != -1) {
@ -1514,7 +1514,7 @@ std::string CmdProxy::TemperatureEvent(int action) {
if (!args.empty()) { if (!args.empty()) {
WrongNumberOfParameters(0); WrongNumberOfParameters(0);
} }
auto t = det->getTemperatureEvent({det_id}); auto t = det->getTemperatureEvent(std::vector<int>{det_id});
os << OutString(t) << '\n'; os << OutString(t) << '\n';
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
if (args.size() != 1) { if (args.size() != 1) {
@ -1524,7 +1524,7 @@ std::string CmdProxy::TemperatureEvent(int action) {
throw sls::RuntimeError("Unknown argument for temp event. Did you " throw sls::RuntimeError("Unknown argument for temp event. Did you "
"mean 0 to reset event?"); "mean 0 to reset event?");
} }
det->resetTemperatureEvent({det_id}); det->resetTemperatureEvent(std::vector<int>{det_id});
os << "cleared" << '\n'; os << "cleared" << '\n';
} else { } else {
throw sls::RuntimeError("Unknown action"); throw sls::RuntimeError("Unknown action");
@ -1546,7 +1546,7 @@ std::string CmdProxy::ROI(int action) {
if (!args.empty()) { if (!args.empty()) {
WrongNumberOfParameters(0); WrongNumberOfParameters(0);
} }
auto t = det->getROI({det_id}); auto t = det->getROI(std::vector<int>{det_id});
for (auto &it : t) { for (auto &it : t) {
os << '[' << it.xmin << ", " << it.xmax << "] \n"; os << '[' << it.xmin << ", " << it.xmax << "] \n";
} }
@ -1579,7 +1579,7 @@ std::string CmdProxy::ClearROI(int action) {
if (!args.empty()) { if (!args.empty()) {
WrongNumberOfParameters(0); WrongNumberOfParameters(0);
} }
det->clearROI({det_id}); det->clearROI(std::vector<int>{det_id});
os << "[-1, -1]\n"; os << "[-1, -1]\n";
} else { } else {
throw sls::RuntimeError("Unknown action"); throw sls::RuntimeError("Unknown action");
@ -1602,7 +1602,7 @@ std::string CmdProxy::InjectChannel(int action) {
if (!args.empty()) { if (!args.empty()) {
WrongNumberOfParameters(0); WrongNumberOfParameters(0);
} }
auto t = det->getInjectChannel({det_id}); auto t = det->getInjectChannel(std::vector<int>{det_id});
os << OutString(t) << '\n'; os << OutString(t) << '\n';
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
if (args.size() != 2) { if (args.size() != 2) {
@ -1632,14 +1632,14 @@ std::string CmdProxy::VetoPhoton(int action) {
if (args.size() != 2) { if (args.size() != 2) {
WrongNumberOfParameters(2); WrongNumberOfParameters(2);
} }
det->getVetoPhoton(StringTo<int>(args[0]), args[1], {det_id}); det->getVetoPhoton(StringTo<int>(args[0]), args[1], std::vector<int>{det_id});
os << "saved to file " << args[1] << '\n'; os << "saved to file " << args[1] << '\n';
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
if (args.size() != 4) { if (args.size() != 4) {
WrongNumberOfParameters(4); WrongNumberOfParameters(4);
} }
det->setVetoPhoton(StringTo<int>(args[0]), StringTo<int>(args[1]), det->setVetoPhoton(StringTo<int>(args[0]), StringTo<int>(args[1]),
StringTo<int>(args[2]), args[3], {det_id}); StringTo<int>(args[2]), args[3], std::vector<int>{det_id});
os << sls::ToString(args) << '\n'; os << sls::ToString(args) << '\n';
} else { } else {
throw sls::RuntimeError("Unknown action"); throw sls::RuntimeError("Unknown action");
@ -1684,7 +1684,7 @@ std::string CmdProxy::VetoFile(int action) {
if (args.size() != 2) { if (args.size() != 2) {
WrongNumberOfParameters(2); WrongNumberOfParameters(2);
} }
det->setVetoFile(StringTo<int>(args[0]), args[1], {det_id}); det->setVetoFile(StringTo<int>(args[0]), args[1], std::vector<int>{det_id});
os << sls::ToString(args) << '\n'; os << sls::ToString(args) << '\n';
} else { } else {
throw sls::RuntimeError("Unknown action"); throw sls::RuntimeError("Unknown action");
@ -1704,7 +1704,7 @@ std::string CmdProxy::BurstMode(int action) {
if (!args.empty()) { if (!args.empty()) {
WrongNumberOfParameters(0); WrongNumberOfParameters(0);
} }
auto t = det->getBurstMode({det_id}); auto t = det->getBurstMode(std::vector<int>{det_id});
os << OutString(t) << '\n'; os << OutString(t) << '\n';
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
if (args.size() != 1) { if (args.size() != 1) {
@ -1732,7 +1732,7 @@ std::string CmdProxy::BurstMode(int action) {
} catch (...) { } catch (...) {
t = sls::StringTo<defs::burstMode>(args[0]); t = sls::StringTo<defs::burstMode>(args[0]);
} }
det->setBurstMode(t, {det_id}); det->setBurstMode(t, std::vector<int>{det_id});
os << sls::ToString(t) << '\n'; // no args to convert 0,1,2 as well os << sls::ToString(t) << '\n'; // no args to convert 0,1,2 as well
} else { } else {
throw sls::RuntimeError("Unknown action"); throw sls::RuntimeError("Unknown action");
@ -1755,7 +1755,7 @@ std::string CmdProxy::ConfigureADC(int action) {
WrongNumberOfParameters(2); WrongNumberOfParameters(2);
} }
auto t = det->getADCConfiguration(StringTo<int>(args[0]), auto t = det->getADCConfiguration(StringTo<int>(args[0]),
StringTo<int>(args[1]), {det_id}); StringTo<int>(args[1]), std::vector<int>{det_id});
os << OutStringHex(t) << '\n'; os << OutStringHex(t) << '\n';
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
if (args.size() != 3) { if (args.size() != 3) {
@ -1763,7 +1763,7 @@ std::string CmdProxy::ConfigureADC(int action) {
} }
int value = StringTo<int>(args[2]); int value = StringTo<int>(args[2]);
det->setADCConfiguration(StringTo<int>(args[0]), StringTo<int>(args[1]), det->setADCConfiguration(StringTo<int>(args[0]), StringTo<int>(args[1]),
value, {det_id}); value, std::vector<int>{det_id});
os << '[' << args[0] << ", " << args[1] << ", " << ToStringHex(value) os << '[' << args[0] << ", " << args[1] << ", " << ToStringHex(value)
<< "]\n"; << "]\n";
} else { } else {
@ -1783,13 +1783,13 @@ std::string CmdProxy::BadChannels(int action) {
if (args.size() != 1) { if (args.size() != 1) {
WrongNumberOfParameters(1); WrongNumberOfParameters(1);
} }
det->getBadChannels(args[0], {det_id}); det->getBadChannels(args[0], std::vector<int>{det_id});
os << "successfully retrieved" << '\n'; os << "successfully retrieved" << '\n';
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
if (args.size() != 1) { if (args.size() != 1) {
WrongNumberOfParameters(1); WrongNumberOfParameters(1);
} }
det->setBadChannels(args[0], {det_id}); det->setBadChannels(args[0], std::vector<int>{det_id});
os << "successfully loaded" << '\n'; os << "successfully loaded" << '\n';
} else { } else {
throw sls::RuntimeError("Unknown action"); throw sls::RuntimeError("Unknown action");
@ -1811,7 +1811,7 @@ std::string CmdProxy::Counters(int action) {
if (!args.empty()) { if (!args.empty()) {
WrongNumberOfParameters(0); WrongNumberOfParameters(0);
} }
auto mask = det->getCounterMask({det_id}).squash(-1); auto mask = det->getCounterMask(std::vector<int>{det_id}).squash(-1);
os << sls::ToString(getSetBits(mask)) << '\n'; os << sls::ToString(getSetBits(mask)) << '\n';
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
if (args.empty()) { if (args.empty()) {
@ -1829,7 +1829,7 @@ std::string CmdProxy::Counters(int action) {
} }
mask |= (1 << val); mask |= (1 << val);
} }
det->setCounterMask(mask, {det_id}); det->setCounterMask(mask, std::vector<int>{det_id});
os << sls::ToString(args) << '\n'; os << sls::ToString(args) << '\n';
} else { } else {
throw sls::RuntimeError("Unknown action"); throw sls::RuntimeError("Unknown action");
@ -1879,7 +1879,7 @@ std::string CmdProxy::GateDelay(int action) {
} }
// vector of gate delays // vector of gate delays
if (gateIndex == -1) { if (gateIndex == -1) {
auto t = det->getGateDelayForAllGates({det_id}); auto t = det->getGateDelayForAllGates(std::vector<int>{det_id});
if (args.empty()) { if (args.empty()) {
os << OutString(t) << '\n'; os << OutString(t) << '\n';
} else if (args.size() == 1) { } else if (args.size() == 1) {
@ -1888,7 +1888,7 @@ std::string CmdProxy::GateDelay(int action) {
} }
// single gate delay // single gate delay
else { else {
auto t = det->getGateDelay(gateIndex, {det_id}); auto t = det->getGateDelay(gateIndex, std::vector<int>{det_id});
if (args.empty()) { if (args.empty()) {
os << OutString(t) << '\n'; os << OutString(t) << '\n';
} else if (args.size() == 1) { } else if (args.size() == 1) {
@ -1900,10 +1900,10 @@ std::string CmdProxy::GateDelay(int action) {
std::string time_str(args[0]); std::string time_str(args[0]);
std::string unit = RemoveUnit(time_str); std::string unit = RemoveUnit(time_str);
auto t = StringTo<time::ns>(time_str, unit); auto t = StringTo<time::ns>(time_str, unit);
det->setGateDelay(gateIndex, t, {det_id}); det->setGateDelay(gateIndex, t, std::vector<int>{det_id});
} else if (args.size() == 2) { } else if (args.size() == 2) {
auto t = StringTo<time::ns>(args[0], args[1]); auto t = StringTo<time::ns>(args[0], args[1]);
det->setGateDelay(gateIndex, t, {det_id}); det->setGateDelay(gateIndex, t, std::vector<int>{det_id});
} else { } else {
WrongNumberOfParameters(2); WrongNumberOfParameters(2);
} }
@ -1932,10 +1932,10 @@ std::string CmdProxy::Samples(int action) {
if (!args.empty()) { if (!args.empty()) {
WrongNumberOfParameters(0); WrongNumberOfParameters(0);
} }
auto a = det->getNumberOfAnalogSamples({det_id}); auto a = det->getNumberOfAnalogSamples(std::vector<int>{det_id});
// get also digital samples for ctb and compare with analog // get also digital samples for ctb and compare with analog
if (det->getDetectorType().squash() == defs::CHIPTESTBOARD) { if (det->getDetectorType().squash() == defs::CHIPTESTBOARD) {
auto d = det->getNumberOfDigitalSamples({det_id}); auto d = det->getNumberOfDigitalSamples(std::vector<int>{det_id});
int as = a.squash(-1); int as = a.squash(-1);
int ds = d.squash(-1); int ds = d.squash(-1);
if (as == -1 || ds == -1 || as != ds) { // check if a == d? if (as == -1 || ds == -1 || as != ds) { // check if a == d?
@ -1948,10 +1948,10 @@ std::string CmdProxy::Samples(int action) {
if (args.size() != 1) { if (args.size() != 1) {
WrongNumberOfParameters(1); WrongNumberOfParameters(1);
} }
det->setNumberOfAnalogSamples(StringTo<int>(args[0]), {det_id}); det->setNumberOfAnalogSamples(StringTo<int>(args[0]), std::vector<int>{det_id});
// set also digital samples for ctb // set also digital samples for ctb
if (det->getDetectorType().squash() == defs::CHIPTESTBOARD) { if (det->getDetectorType().squash() == defs::CHIPTESTBOARD) {
det->setNumberOfDigitalSamples(StringTo<int>(args[0]), {det_id}); det->setNumberOfDigitalSamples(StringTo<int>(args[0]), std::vector<int>{det_id});
} }
os << args.front() << '\n'; os << args.front() << '\n';
} else { } else {
@ -1978,7 +1978,7 @@ std::string CmdProxy::SlowAdc(int action) {
throw sls::RuntimeError("Unknown adc argument " + args[0]); throw sls::RuntimeError("Unknown adc argument " + args[0]);
} }
auto t = det->getSlowADC( auto t = det->getSlowADC(
static_cast<defs::dacIndex>(nchan + defs::SLOW_ADC0), {det_id}); static_cast<defs::dacIndex>(nchan + defs::SLOW_ADC0), std::vector<int>{det_id});
Result<double> result(t.size()); Result<double> result(t.size());
for (unsigned int i = 0; i < t.size(); ++i) { for (unsigned int i = 0; i < t.size(); ++i) {
result[i] = t[i] / 1000.00; result[i] = t[i] / 1000.00;
@ -2006,7 +2006,7 @@ std::string CmdProxy::ReceiverDbitList(int action) {
if (!args.empty()) { if (!args.empty()) {
WrongNumberOfParameters(0); WrongNumberOfParameters(0);
} }
auto t = det->getRxDbitList({det_id}); auto t = det->getRxDbitList(std::vector<int>{det_id});
os << OutString(t) << '\n'; os << OutString(t) << '\n';
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
if (args.empty()) { if (args.empty()) {
@ -2025,7 +2025,7 @@ std::string CmdProxy::ReceiverDbitList(int action) {
t[i] = StringTo<int>(args[i]); t[i] = StringTo<int>(args[i]);
} }
} }
det->setRxDbitList(t, {det_id}); det->setRxDbitList(t, std::vector<int>{det_id});
os << sls::ToString(args) << '\n'; os << sls::ToString(args) << '\n';
} else { } else {
throw sls::RuntimeError("Unknown action"); throw sls::RuntimeError("Unknown action");
@ -2048,7 +2048,7 @@ std::string CmdProxy::DigitalIODelay(int action) {
WrongNumberOfParameters(2); WrongNumberOfParameters(2);
} }
det->setDigitalIODelay(StringTo<uint64_t>(args[0]), det->setDigitalIODelay(StringTo<uint64_t>(args[0]),
StringTo<int>(args[1]), {det_id}); StringTo<int>(args[1]), std::vector<int>{det_id});
os << sls::ToString(args) << '\n'; os << sls::ToString(args) << '\n';
} else { } else {
throw sls::RuntimeError("Unknown action"); throw sls::RuntimeError("Unknown action");
@ -2071,7 +2071,7 @@ std::string CmdProxy::Pattern(int action) {
if (args.size() != 1) { if (args.size() != 1) {
WrongNumberOfParameters(1); WrongNumberOfParameters(1);
} }
det->setPattern(args[0], {det_id}); det->setPattern(args[0], std::vector<int>{det_id});
os << args.front() << '\n'; os << args.front() << '\n';
} else { } else {
throw sls::RuntimeError("Unknown action"); throw sls::RuntimeError("Unknown action");
@ -2092,7 +2092,7 @@ std::string CmdProxy::PatternWord(int action) {
WrongNumberOfParameters(1); WrongNumberOfParameters(1);
} }
int addr = StringTo<int>(args[0]); int addr = StringTo<int>(args[0]);
auto t = det->getPatternWord(addr, {det_id}); auto t = det->getPatternWord(addr, std::vector<int>{det_id});
os << '[' << ToStringHex(addr, 4) << ", " << OutStringHex(t, 16) os << '[' << ToStringHex(addr, 4) << ", " << OutStringHex(t, 16)
<< "]\n"; << "]\n";
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
@ -2101,7 +2101,7 @@ std::string CmdProxy::PatternWord(int action) {
} }
int addr = StringTo<int>(args[0]); int addr = StringTo<int>(args[0]);
uint64_t word = StringTo<uint64_t>(args[1]); uint64_t word = StringTo<uint64_t>(args[1]);
det->setPatternWord(addr, word, {det_id}); det->setPatternWord(addr, word, std::vector<int>{det_id});
os << '[' << ToStringHex(addr, 4) << ", " << ToStringHex(word, 16) os << '[' << ToStringHex(addr, 4) << ", " << ToStringHex(word, 16)
<< "]\n"; << "]\n";
} else { } else {
@ -2152,7 +2152,7 @@ std::string CmdProxy::PatternLoopAddresses(int action) {
if (!args.empty()) { if (!args.empty()) {
WrongNumberOfParameters(0); WrongNumberOfParameters(0);
} }
auto t = det->getPatternLoopAddresses(level, {det_id}); auto t = det->getPatternLoopAddresses(level, std::vector<int>{det_id});
os << OutStringHex(t, 4) << '\n'; os << OutStringHex(t, 4) << '\n';
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
if (args.size() != 2) { if (args.size() != 2) {
@ -2160,7 +2160,7 @@ std::string CmdProxy::PatternLoopAddresses(int action) {
} }
int start = StringTo<int>(args[0]); int start = StringTo<int>(args[0]);
int stop = StringTo<int>(args[1]); int stop = StringTo<int>(args[1]);
det->setPatternLoopAddresses(level, start, stop, {det_id}); det->setPatternLoopAddresses(level, start, stop, std::vector<int>{det_id});
os << '[' << ToStringHex(start, 4) << ", " << ToStringHex(stop, 4) os << '[' << ToStringHex(start, 4) << ", " << ToStringHex(stop, 4)
<< "]\n"; << "]\n";
} else { } else {
@ -2206,13 +2206,13 @@ std::string CmdProxy::PatternLoopCycles(int action) {
if (!args.empty()) { if (!args.empty()) {
WrongNumberOfParameters(0); WrongNumberOfParameters(0);
} }
auto t = det->getPatternLoopCycles(level, {det_id}); auto t = det->getPatternLoopCycles(level, std::vector<int>{det_id});
os << OutString(t) << '\n'; os << OutString(t) << '\n';
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
if (args.size() != 1) { if (args.size() != 1) {
WrongNumberOfParameters(1); WrongNumberOfParameters(1);
} }
det->setPatternLoopCycles(level, StringTo<int>(args[0]), {det_id}); det->setPatternLoopCycles(level, StringTo<int>(args[0]), std::vector<int>{det_id});
os << args.front() << '\n'; os << args.front() << '\n';
} else { } else {
throw sls::RuntimeError("Unknown action"); throw sls::RuntimeError("Unknown action");
@ -2251,14 +2251,14 @@ std::string CmdProxy::PatternWaitAddress(int action) {
if (!args.empty()) { if (!args.empty()) {
WrongNumberOfParameters(0); WrongNumberOfParameters(0);
} }
auto t = det->getPatternWaitAddr(level, {det_id}); auto t = det->getPatternWaitAddr(level, std::vector<int>{det_id});
os << OutStringHex(t, 4) << '\n'; os << OutStringHex(t, 4) << '\n';
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
if (args.size() != 1) { if (args.size() != 1) {
WrongNumberOfParameters(1); WrongNumberOfParameters(1);
} }
int addr = StringTo<int>(args[0]); int addr = StringTo<int>(args[0]);
det->setPatternWaitAddr(level, addr, {det_id}); det->setPatternWaitAddr(level, addr, std::vector<int>{det_id});
os << ToStringHex(addr, 4) << '\n'; os << ToStringHex(addr, 4) << '\n';
} else { } else {
throw sls::RuntimeError("Unknown action"); throw sls::RuntimeError("Unknown action");
@ -2303,7 +2303,7 @@ std::string CmdProxy::PatternWaitTime(int action) {
if (!args.empty()) { if (!args.empty()) {
WrongNumberOfParameters(0); WrongNumberOfParameters(0);
} }
auto t = det->getPatternWaitTime(level, {det_id}); auto t = det->getPatternWaitTime(level, std::vector<int>{det_id});
os << OutString(t) << '\n'; os << OutString(t) << '\n';
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
if (args.size() != 1) { if (args.size() != 1) {
@ -2336,7 +2336,7 @@ std::string CmdProxy::AdditionalJsonHeader(int action) {
if (!args.empty()) { if (!args.empty()) {
WrongNumberOfParameters(0); WrongNumberOfParameters(0);
} }
auto t = det->getAdditionalJsonHeader({det_id}); auto t = det->getAdditionalJsonHeader(std::vector<int>{det_id});
os << OutString(t) << '\n'; os << OutString(t) << '\n';
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
// arguments can be empty // arguments can be empty
@ -2349,7 +2349,7 @@ std::string CmdProxy::AdditionalJsonHeader(int action) {
json[args[i]] = args[i + 1]; json[args[i]] = args[i + 1];
} }
} }
det->setAdditionalJsonHeader(json, {det_id}); det->setAdditionalJsonHeader(json, std::vector<int>{det_id});
os << sls::ToString(json) << '\n'; os << sls::ToString(json) << '\n';
} else { } else {
throw sls::RuntimeError("Unknown action"); throw sls::RuntimeError("Unknown action");
@ -2370,15 +2370,15 @@ std::string CmdProxy::JsonParameter(int action) {
if (args.size() != 1) { if (args.size() != 1) {
WrongNumberOfParameters(1); WrongNumberOfParameters(1);
} }
auto t = det->getAdditionalJsonParameter(args[0], {det_id}); auto t = det->getAdditionalJsonParameter(args[0], std::vector<int>{det_id});
os << OutString(t) << '\n'; os << OutString(t) << '\n';
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
switch (args.size()) { switch (args.size()) {
case 1: case 1:
det->setAdditionalJsonParameter(args[0], "", {det_id}); det->setAdditionalJsonParameter(args[0], "", std::vector<int>{det_id});
break; break;
case 2: case 2:
det->setAdditionalJsonParameter(args[0], args[1], {det_id}); det->setAdditionalJsonParameter(args[0], args[1], std::vector<int>{det_id});
break; break;
default: default:
WrongNumberOfParameters(1); WrongNumberOfParameters(1);
@ -2409,7 +2409,7 @@ std::string CmdProxy::ProgramFpga(int action) {
if (args.size() != 1) { if (args.size() != 1) {
WrongNumberOfParameters(1); WrongNumberOfParameters(1);
} }
det->programFPGA(args[0], {det_id}); det->programFPGA(args[0], std::vector<int>{det_id});
os << "successful\n"; os << "successful\n";
} else { } else {
throw sls::RuntimeError("Unknown action"); throw sls::RuntimeError("Unknown action");
@ -2434,7 +2434,7 @@ std::string CmdProxy::CopyDetectorServer(int action) {
if (args.size() != 2) { if (args.size() != 2) {
WrongNumberOfParameters(2); WrongNumberOfParameters(2);
} }
det->copyDetectorServer(args[0], args[1], {det_id}); det->copyDetectorServer(args[0], args[1], std::vector<int>{det_id});
os << "successful\n"; os << "successful\n";
} else { } else {
throw sls::RuntimeError("Unknown action"); throw sls::RuntimeError("Unknown action");
@ -2460,7 +2460,7 @@ std::string CmdProxy::UpdateFirmwareAndDetectorServer(int action) {
if (args[2].find(".pof") == std::string::npos) { if (args[2].find(".pof") == std::string::npos) {
throw sls::RuntimeError("Programming file must be a pof file."); throw sls::RuntimeError("Programming file must be a pof file.");
} }
det->updateFirmwareAndServer(args[0], args[1], args[2], {det_id}); det->updateFirmwareAndServer(args[0], args[1], args[2], std::vector<int>{det_id});
os << "successful\n"; os << "successful\n";
} else { } else {
throw sls::RuntimeError("Unknown action"); throw sls::RuntimeError("Unknown action");
@ -2480,14 +2480,14 @@ std::string CmdProxy::Register(int action) {
if (args.size() != 1) { if (args.size() != 1) {
WrongNumberOfParameters(1); WrongNumberOfParameters(1);
} }
auto t = det->readRegister(StringTo<uint32_t>(args[0]), {det_id}); auto t = det->readRegister(StringTo<uint32_t>(args[0]), std::vector<int>{det_id});
os << OutStringHex(t) << '\n'; os << OutStringHex(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);
} }
det->writeRegister(StringTo<uint32_t>(args[0]), det->writeRegister(StringTo<uint32_t>(args[0]),
StringTo<uint32_t>(args[1]), {det_id}); StringTo<uint32_t>(args[1]), std::vector<int>{det_id});
os << sls::ToString(args) << '\n'; os << sls::ToString(args) << '\n';
} else { } else {
throw sls::RuntimeError("Unknown action"); throw sls::RuntimeError("Unknown action");
@ -2510,7 +2510,7 @@ std::string CmdProxy::AdcRegister(int action) {
WrongNumberOfParameters(2); WrongNumberOfParameters(2);
} }
det->writeAdcRegister(StringTo<uint32_t>(args[0]), det->writeAdcRegister(StringTo<uint32_t>(args[0]),
StringTo<uint32_t>(args[1]), {det_id}); StringTo<uint32_t>(args[1]), std::vector<int>{det_id});
os << sls::ToString(args) << '\n'; os << sls::ToString(args) << '\n';
} else { } else {
throw sls::RuntimeError("Unknown action"); throw sls::RuntimeError("Unknown action");
@ -2556,7 +2556,7 @@ std::string CmdProxy::BitOperations(int action) {
if (cmd == "setbit" || cmd == "clearbit") { if (cmd == "setbit" || cmd == "clearbit") {
throw sls::RuntimeError("Cannot get"); throw sls::RuntimeError("Cannot get");
} }
auto t = det->readRegister(addr, {det_id}); auto t = det->readRegister(addr, std::vector<int>{det_id});
Result<int> result(t.size()); Result<int> result(t.size());
for (unsigned int i = 0; i < t.size(); ++i) { for (unsigned int i = 0; i < t.size(); ++i) {
result[i] = ((t[i] >> bitnr) & 0x1); result[i] = ((t[i] >> bitnr) & 0x1);
@ -2567,9 +2567,9 @@ std::string CmdProxy::BitOperations(int action) {
throw sls::RuntimeError("Cannot put"); throw sls::RuntimeError("Cannot put");
} }
if (cmd == "setbit") { if (cmd == "setbit") {
det->setBit(addr, bitnr, {det_id}); det->setBit(addr, bitnr, std::vector<int>{det_id});
} else if (cmd == "clearbit") { } else if (cmd == "clearbit") {
det->clearBit(addr, bitnr, {det_id}); det->clearBit(addr, bitnr, std::vector<int>{det_id});
} }
os << sls::ToString(args) << '\n'; os << sls::ToString(args) << '\n';
} else { } else {
@ -2627,7 +2627,7 @@ std::string CmdProxy::ExecuteCommand(int action) {
if (args.size() != 1) { if (args.size() != 1) {
WrongNumberOfParameters(1); WrongNumberOfParameters(1);
} }
auto t = det->executeCommand(args[0], {det_id}); auto t = det->executeCommand(args[0], std::vector<int>{det_id});
os << OutString(t) << '\n'; os << OutString(t) << '\n';
} else { } else {
throw sls::RuntimeError("Unknown action"); throw sls::RuntimeError("Unknown action");