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