From 511c20678722ddb2ed83878ed2194cfdf9852dfa Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Thu, 17 Sep 2020 12:11:19 +0200 Subject: [PATCH] replaced initializer list with vector for CmdProxy --- slsDetectorSoftware/src/CmdProxy.cpp | 14 +- slsDetectorSoftware/src/CmdProxy.h | 248 ++++++++++++++++----------- 2 files changed, 159 insertions(+), 103 deletions(-) diff --git a/slsDetectorSoftware/src/CmdProxy.cpp b/slsDetectorSoftware/src/CmdProxy.cpp index 31801dec9..f61d8dd4c 100644 --- a/slsDetectorSoftware/src/CmdProxy.cpp +++ b/slsDetectorSoftware/src/CmdProxy.cpp @@ -420,7 +420,7 @@ std::string CmdProxy::Exptime(int action) { // vector of exptimes if (gateIndex == -1 && det->getDetectorType().squash() == defs::MYTHEN3) { - auto t = det->getExptimeForAllGates({det_id}); + auto t = det->getExptimeForAllGates(std::vector{det_id}); if (args.empty()) { os << OutString(t) << '\n'; } else if (args.size() == 1) { @@ -431,9 +431,9 @@ std::string CmdProxy::Exptime(int action) { else { Result t; if (gateIndex == -1) { - t = det->getExptime({det_id}); + t = det->getExptime(std::vector{det_id}); } else { - t = det->getExptime(gateIndex, {det_id}); + t = det->getExptime(gateIndex, std::vector{det_id}); } if (args.empty()) { os << OutString(t) << '\n'; @@ -448,16 +448,16 @@ std::string CmdProxy::Exptime(int action) { std::string unit = RemoveUnit(time_str); auto t = StringTo(time_str, unit); if (type == defs::MYTHEN3) { - det->setExptime(gateIndex, t, {det_id}); + det->setExptime(gateIndex, t, std::vector{det_id}); } else { - det->setExptime(t, {det_id}); + det->setExptime(t, std::vector{det_id}); } } else if (args.size() == 2) { auto t = StringTo(args[0], args[1]); if (type == defs::MYTHEN3) { - det->setExptime(gateIndex, t, {det_id}); + det->setExptime(gateIndex, t, std::vector{det_id}); } else { - det->setExptime(t, {det_id}); + det->setExptime(t, std::vector{det_id}); } } else { WrongNumberOfParameters(2); diff --git a/slsDetectorSoftware/src/CmdProxy.h b/slsDetectorSoftware/src/CmdProxy.h index 55451b49b..20a5d8b0a 100644 --- a/slsDetectorSoftware/src/CmdProxy.h +++ b/slsDetectorSoftware/src/CmdProxy.h @@ -24,7 +24,7 @@ if (action == slsDetectorDefs::HELP_ACTION) \ os << HLPSTR << '\n'; \ else if (action == slsDetectorDefs::GET_ACTION) { \ - auto t = det->GETFCN({det_id}); \ + auto t = det->GETFCN(std::vector{det_id}); \ if (args.empty()) { \ os << OutString(t) << '\n'; \ } else if (args.size() == 1) { \ @@ -37,10 +37,10 @@ std::string time_str(args[0]); \ std::string unit = RemoveUnit(time_str); \ auto t = StringTo(time_str, unit); \ - det->SETFCN(t, {det_id}); \ + det->SETFCN(t, std::vector{det_id}); \ } else if (args.size() == 2) { \ auto t = StringTo(args[0], args[1]); \ - det->SETFCN(t, {det_id}); \ + det->SETFCN(t, std::vector{det_id}); \ } else { \ WrongNumberOfParameters(2); \ } \ @@ -64,7 +64,7 @@ if (action == slsDetectorDefs::HELP_ACTION) \ os << HLPSTR << '\n'; \ else if (action == slsDetectorDefs::GET_ACTION) { \ - auto t = det->GETFCN({det_id}); \ + auto t = det->GETFCN(std::vector{det_id}); \ if (args.empty()) { \ os << OutString(t) << '\n'; \ } else if (args.size() == 1) { \ @@ -91,13 +91,13 @@ if (!args.empty()) { \ WrongNumberOfParameters(0); \ } \ - auto t = det->GETFCN({det_id}); \ + auto t = det->GETFCN(std::vector{det_id}); \ os << OutString(t) << '\n'; \ } else if (action == slsDetectorDefs::PUT_ACTION) { \ if (args.size() != 1) { \ WrongNumberOfParameters(1); \ } \ - det->SETFCN(args[0], {det_id}); \ + det->SETFCN(args[0], std::vector{det_id}); \ os << args.front() << '\n'; \ } else { \ throw sls::RuntimeError("Unknown action"); \ @@ -116,14 +116,14 @@ if (!args.empty()) { \ WrongNumberOfParameters(0); \ } \ - auto t = det->GETFCN({det_id}); \ + auto t = det->GETFCN(std::vector{det_id}); \ os << OutStringHex(t, 16) << '\n'; \ } else if (action == slsDetectorDefs::PUT_ACTION) { \ if (args.size() != 1) { \ WrongNumberOfParameters(1); \ } \ auto val = CONV(args[0]); \ - det->SETFCN(val, {det_id}); \ + det->SETFCN(val, std::vector{det_id}); \ os << ToStringHex(val, 16) << '\n'; \ } else { \ throw sls::RuntimeError("Unknown action"); \ @@ -142,14 +142,14 @@ if (!args.empty()) { \ WrongNumberOfParameters(0); \ } \ - auto t = det->GETFCN({det_id}); \ + auto t = det->GETFCN(std::vector{det_id}); \ os << OutStringHex(t) << '\n'; \ } else if (action == slsDetectorDefs::PUT_ACTION) { \ if (args.size() != 1) { \ WrongNumberOfParameters(1); \ } \ auto val = CONV(args[0]); \ - det->SETFCN(val, {det_id}); \ + det->SETFCN(val, std::vector{det_id}); \ os << args.front() << '\n'; \ } else { \ throw sls::RuntimeError("Unknown action"); \ @@ -158,7 +158,7 @@ } /** int or enum */ -#define INTEGER_COMMAND(CMDNAME, GETFCN, SETFCN, CONV, HLPSTR) \ +#define INTEGER_COMMAND_VEC_ID(CMDNAME, GETFCN, SETFCN, CONV, HLPSTR) \ std::string CMDNAME(const int action) { \ std::ostringstream os; \ os << cmd << ' '; \ @@ -168,14 +168,67 @@ if (!args.empty()) { \ WrongNumberOfParameters(0); \ } \ - auto t = det->GETFCN({det_id}); \ + auto t = det->GETFCN(std::vector{det_id}); \ os << OutString(t) << '\n'; \ } else if (action == slsDetectorDefs::PUT_ACTION) { \ if (args.size() != 1) { \ WrongNumberOfParameters(1); \ } \ auto val = CONV(args[0]); \ - det->SETFCN(val, {det_id}); \ + det->SETFCN(val, std::vector{det_id}); \ + os << args.front() << '\n'; \ + } else { \ + throw sls::RuntimeError("Unknown action"); \ + } \ + return os.str(); \ + } + + +/** int or enum */ +#define INTEGER_COMMAND_VEC_ID_GET(CMDNAME, GETFCN, SETFCN, CONV, HLPSTR) \ + std::string CMDNAME(const int action) { \ + std::ostringstream os; \ + os << cmd << ' '; \ + if (action == slsDetectorDefs::HELP_ACTION) \ + os << HLPSTR << '\n'; \ + else if (action == slsDetectorDefs::GET_ACTION) { \ + if (!args.empty()) { \ + WrongNumberOfParameters(0); \ + } \ + auto t = det->GETFCN(std::vector{det_id}); \ + os << OutString(t) << '\n'; \ + } else if (action == slsDetectorDefs::PUT_ACTION) { \ + if (args.size() != 1) { \ + WrongNumberOfParameters(1); \ + } \ + auto val = CONV(args[0]); \ + det->SETFCN(val, det_id); \ + os << args.front() << '\n'; \ + } else { \ + throw sls::RuntimeError("Unknown action"); \ + } \ + return os.str(); \ + } + +/** int or enum */ +#define INTEGER_COMMAND_SINGLE_ID(CMDNAME, GETFCN, SETFCN, CONV, HLPSTR) \ + std::string CMDNAME(const int action) { \ + std::ostringstream os; \ + os << cmd << ' '; \ + if (action == slsDetectorDefs::HELP_ACTION) \ + os << HLPSTR << '\n'; \ + else if (action == slsDetectorDefs::GET_ACTION) { \ + if (!args.empty()) { \ + WrongNumberOfParameters(0); \ + } \ + auto t = det->GETFCN(det_id); \ + os << OutString(t) << '\n'; \ + } else if (action == slsDetectorDefs::PUT_ACTION) { \ + if (args.size() != 1) { \ + WrongNumberOfParameters(1); \ + } \ + auto val = CONV(args[0]); \ + det->SETFCN(val, det_id); \ os << args.front() << '\n'; \ } else { \ throw sls::RuntimeError("Unknown action"); \ @@ -223,14 +276,14 @@ if (!args.empty()) { \ WrongNumberOfParameters(0); \ } \ - auto t = det->GETFCN(INDEX, {det_id}); \ + auto t = det->GETFCN(INDEX, std::vector{det_id}); \ os << OutString(t) << '\n'; \ } else if (action == slsDetectorDefs::PUT_ACTION) { \ if (args.size() != 1) { \ WrongNumberOfParameters(1); \ } \ auto val = CONV(args[0]); \ - det->SETFCN(INDEX, val, {det_id}); \ + det->SETFCN(INDEX, val, std::vector{det_id}); \ os << args.front() << '\n'; \ } else { \ throw sls::RuntimeError("Unknown action"); \ @@ -249,14 +302,16 @@ if (args.size() != 1) { \ WrongNumberOfParameters(1); \ } \ - auto t = det->GETFCN(INDEX, StringTo(args[0]), {det_id}); \ + auto t = det->GETFCN(INDEX, StringTo(args[0]), \ + std::vector{det_id}); \ os << args[0] << ' ' << OutStringHex(t) << '\n'; \ } else if (action == slsDetectorDefs::PUT_ACTION) { \ if (args.size() != 2) { \ WrongNumberOfParameters(2); \ } \ auto val = CONV(args[1]); \ - det->SETFCN(INDEX, StringTo(args[0]), val, {det_id}); \ + det->SETFCN(INDEX, StringTo(args[0]), val, \ + std::vector{det_id}); \ os << args[0] << ' ' << args[1] << '\n'; \ } else { \ throw sls::RuntimeError("Unknown action"); \ @@ -282,7 +337,7 @@ } else if (args.size() > 1) { \ WrongNumberOfParameters(0); \ } \ - auto t = det->GETFCN(DAC_INDEX, mv, {det_id}); \ + auto t = det->GETFCN(DAC_INDEX, mv, std::vector{det_id}); \ os << OutString(t) << (!args.empty() ? " mV\n" : "\n"); \ } else if (action == slsDetectorDefs::PUT_ACTION) { \ bool mv = false; \ @@ -295,7 +350,8 @@ } else if (args.size() > 2 || args.empty()) { \ WrongNumberOfParameters(1); \ } \ - det->SETFCN(DAC_INDEX, StringTo(args[0]), mv, {det_id}); \ + det->SETFCN(DAC_INDEX, StringTo(args[0]), mv, \ + std::vector{det_id}); \ os << args.front() << (args.size() > 1 ? " mV\n" : "\n"); \ } else { \ throw sls::RuntimeError("Unknown action"); \ @@ -340,7 +396,7 @@ if (!args.empty()) { \ WrongNumberOfParameters(0); \ } \ - det->SETFCN({det_id}); \ + det->SETFCN(std::vector{det_id}); \ os << "successful\n"; \ } else { \ throw sls::RuntimeError("Unknown action"); \ @@ -385,7 +441,7 @@ if (args.size() != 1) { \ WrongNumberOfParameters(1); \ } \ - det->SETFCN(args[0], {det_id}); \ + det->SETFCN(args[0], std::vector{det_id}); \ os << args.front() << '\n'; \ } else { \ throw sls::RuntimeError("Unknown action"); \ @@ -404,7 +460,7 @@ if (!args.empty()) { \ WrongNumberOfParameters(0); \ } \ - auto t = det->GETFCN({det_id}); \ + auto t = det->GETFCN(std::vector{det_id}); \ os << OutString(t) << '\n'; \ } else if (action == slsDetectorDefs::PUT_ACTION) { \ throw sls::RuntimeError("Cannot put"); \ @@ -446,7 +502,7 @@ if (!args.empty()) { \ WrongNumberOfParameters(0); \ } \ - auto t = det->GETFCN({det_id}); \ + auto t = det->GETFCN(std::vector{det_id}); \ os << OutStringHex(t) << '\n'; \ } else if (action == slsDetectorDefs::PUT_ACTION) { \ throw sls::RuntimeError("Cannot put"); \ @@ -466,7 +522,7 @@ if (!args.empty()) { \ WrongNumberOfParameters(0); \ } \ - auto t = det->GETFCN(VAL, {det_id}); \ + auto t = det->GETFCN(VAL, std::vector{det_id}); \ os << OutString(t) << APPEND << '\n'; \ } else if (action == slsDetectorDefs::PUT_ACTION) { \ throw sls::RuntimeError("Cannot put"); \ @@ -1133,7 +1189,7 @@ class CmdProxy { GET_COMMAND_NOID(settingslist, getSettingsList, "\n\tList of settings implemented for this detector."); - INTEGER_COMMAND(settings, getSettings, setSettings, + INTEGER_COMMAND_VEC_ID(settings, getSettings, setSettings, sls::StringTo, "[standard, fast, highgain, dynamicgain, lowgain, " "mediumgain, veryhighgain, dynamichg0, " @@ -1156,7 +1212,7 @@ class CmdProxy { "[fname]\n\t[Eiger][Mythen3] Loads the trimbit file to detector. If no " "extension specified, serial number of each module is attached."); - INTEGER_COMMAND(trimval, getAllTrimbits, setAllTrimbits, StringTo, + INTEGER_COMMAND_VEC_ID(trimval, getAllTrimbits, setAllTrimbits, StringTo, "[n_trimval]\n\t[Eiger][Mythen3] All trimbits set to this " "value. Returns -1 if all trimbits are different values."); @@ -1206,7 +1262,7 @@ class CmdProxy { GET_COMMAND_NOID(drlist, getDynamicRangeList, "\n\tGets the list of dynamic ranges for this detector."); - INTEGER_COMMAND(timing, getTimingMode, setTimingMode, + INTEGER_COMMAND_VEC_ID(timing, getTimingMode, setTimingMode, sls::StringTo, "[auto|trigger|gating|burst_trigger]\n\tTiming Mode of " "detector.\n\t[Jungfrau][Gotthard][Ctb][Moench][Gotthard2] " @@ -1225,13 +1281,13 @@ class CmdProxy { "\n\t[CTB][Jungfrau] Absolute maximum Phase shift of of the " "clock to latch digital bits."); - INTEGER_COMMAND(highvoltage, getHighVoltage, setHighVoltage, StringTo, + INTEGER_COMMAND_VEC_ID(highvoltage, getHighVoltage, setHighVoltage, StringTo, "[n_value]\n\tHigh voltage to the sensor in Voltage." "\n\t[Gotthard] [0|90|110|120|150|180|200]" "\n\t[Eiger][Mythen3][Gotthard2] 0-200" "\n\t[Jungfrau][Ctb][Moench] [0|60-200]"); - INTEGER_COMMAND(powerchip, getPowerChip, setPowerChip, StringTo, + INTEGER_COMMAND_VEC_ID(powerchip, getPowerChip, setPowerChip, StringTo, "[0, 1]\n\t[Jungfrau][Mythen3][Gotthard2][Moench] Power " "the chip. Default 0." "\n\t[Jungfrau] Get will return power status." @@ -1242,14 +1298,14 @@ class CmdProxy { "\n\t[Gotthard2] If module not connected or wrong module, " "1 will fail. By default, powered on at server start up."); - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( imagetest, getImageTestMode, setImageTestMode, StringTo, "[0, 1]\n\t[Gotthard] 1 adds channel intensity with precalculated " "values when taking an acquisition. Default is 0." "\n\t[Eiger][Jungfrau] Only for Virtual servers. If 0, each pixel " "intensity incremented by 1. If 1, all pixels almost saturated."); - INTEGER_COMMAND(parallel, getParallelMode, setParallelMode, StringTo, + INTEGER_COMMAND_VEC_ID(parallel, getParallelMode, setParallelMode, StringTo, "[0, 1]\n\t[Eiger][Mythen3] Enable or disable parallel " "mode.\n\t[Mythen3] If exptime is too short, the " "acquisition will return ERROR status and take fewer " @@ -1637,7 +1693,7 @@ class CmdProxy { GET_COMMAND(rx_missingpackets, getNumMissingPackets, "\n\tNumber of missing packets for each port in receiver."); - INTEGER_COMMAND(startingfnum, getStartingFrameNumber, + INTEGER_COMMAND_VEC_ID(startingfnum, getStartingFrameNumber, setStartingFrameNumber, StringTo, "[n_value]\n\t[Eiger][Jungfrau] Starting frame number for " "next acquisition. Stopping acquiistion might result in " @@ -1653,7 +1709,7 @@ class CmdProxy { /* Network Configuration (Detector<->Receiver) */ - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( numinterfaces, getNumberofUDPInterfaces, setNumberofUDPInterfaces, StringTo, "[1, 2]\n\t[Jungfrau][Gotthard2] Number of udp interfaces to stream " @@ -1664,42 +1720,42 @@ class CmdProxy { "veto information via 10Gbps for debugging. By default, if veto " "enabled, it is sent via 2.5 gbps interface."); - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( selinterface, getSelectedUDPInterface, selectUDPInterface, StringTo, "[0, 1]\n\t[Jungfrau] The udp interface to stream data from detector. " "Effective only when number of interfaces is 1. Default: 0 (outer)"); - INTEGER_COMMAND(udp_srcip, getSourceUDPIP, setSourceUDPIP, IpAddr, + INTEGER_COMMAND_VEC_ID(udp_srcip, getSourceUDPIP, setSourceUDPIP, IpAddr, "[x.x.x.x]\n\tIp address of the detector (source) udp " "interface. Must be same subnet as destination udp " "ip.\n\t[Eiger] Set only for 10G. For 1G, detector will " "replace with its own DHCP IP address."); - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( udp_srcip2, getSourceUDPIP2, setSourceUDPIP2, IpAddr, "[x.x.x.x]\n\t[Jungfrau][Gotthard2] Ip address of the detector " "(source) udp interface 2. Must be same subnet as destination udp " "ip2.\n\t [Jungfrau] bottom half \n\t [Gotthard2] veto debugging."); - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( udp_srcmac, getSourceUDPMAC, setSourceUDPMAC, MacAddr, "[x:x:x:x:x:x]\n\tMac address of the detector (source) udp " "interface. \n\t[Eiger] Do not set as detector will replace with its " "own DHCP Mac (1G) or DHCP Mac + 1 (10G)."); - INTEGER_COMMAND(udp_srcmac2, getSourceUDPMAC2, setSourceUDPMAC2, MacAddr, + INTEGER_COMMAND_VEC_ID(udp_srcmac2, getSourceUDPMAC2, setSourceUDPMAC2, MacAddr, "[x:x:x:x:x:x]\n\t[Jungfrau] Mac address of the bottom " "half of detector (source) udp interface. "); - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( udp_dstmac, getDestinationUDPMAC, setDestinationUDPMAC, MacAddr, "[x:x:x:x:x:x]\n\tMac address of the receiver (destination) udp " "interface. Not mandatory to set as udp_dstip retrieves it from " "slsReceiver process, but must be set if you use a custom receiver " "(not slsReceiver)."); - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( udp_dstmac2, getDestinationUDPMAC2, setDestinationUDPMAC2, MacAddr, "[x:x:x:x:x:x]\n\t[Jungfrau] Mac address of the receiver (destination) " "udp interface 2. Not mandatory to set as udp_dstip2 retrieves it from " @@ -1707,14 +1763,14 @@ class CmdProxy { "slsReceiver). \n\t [Jungfrau] bottom half \n\t [Gotthard2] veto " "debugging."); - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID_GET( udp_dstport, getDestinationUDPPort, setDestinationUDPPort, StringTo, "[n]\n\tPort number of the receiver (destination) udp " "interface. Default is 50001. \n\tIf multi command, ports for each " "module is calculated (incremented by 1 if no 2nd interface)"); - INTEGER_COMMAND(udp_dstport2, getDestinationUDPPort2, + INTEGER_COMMAND_VEC_ID_GET(udp_dstport2, getDestinationUDPPort2, setDestinationUDPPort2, StringTo, "[n]\n\t[Jungfrau][Eiger][Gotthard2] Port number of the " "receiver (destination) udp interface 2. Default is 50002. " @@ -1737,14 +1793,14 @@ class CmdProxy { GET_COMMAND(rx_printconfig, printRxConfiguration, "\n\tPrints the receiver configuration."); - INTEGER_COMMAND(tengiga, getTenGiga, setTenGiga, StringTo, + INTEGER_COMMAND_VEC_ID(tengiga, getTenGiga, setTenGiga, StringTo, "[0, 1]\n\t[Eiger][Ctb][Moench][Mythen3] 10GbE Enable."); - INTEGER_COMMAND(flowcontrol10g, getTenGigaFlowControl, + INTEGER_COMMAND_VEC_ID(flowcontrol10g, getTenGigaFlowControl, setTenGigaFlowControl, StringTo, "[0, 1]\n\t[Eiger][Jungfrau] 10GbE Flow Control."); - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( txndelay_frame, getTransmissionDelayFrame, setTransmissionDelayFrame, StringTo, "[n_delay]\n\t[Eiger][Jungfrau][Mythen3] Transmission delay of each " @@ -1755,14 +1811,14 @@ class CmdProxy { "50000.\n\t[Mythen3] [0-16777215] Each value represents 8 ns (125 MHz " "clock), max is 134 ms."); - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( txndelay_left, getTransmissionDelayLeft, setTransmissionDelayLeft, StringTo, "[n_delay]\n\t[Eiger] Transmission delay of first packet in an image " "being streamed out of the module's left UDP port. Each value " "represents 10ns. Typical value is 50000."); - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( txndelay_right, getTransmissionDelayRight, setTransmissionDelayRight, StringTo, "[n_delay]\n\t[Eiger] Transmission delay of first packet in an image " @@ -1771,22 +1827,22 @@ class CmdProxy { /* Receiver Config */ - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID_GET( rx_tcpport, getRxPort, setRxPort, StringTo, "[port]\n\tTCP port for client-receiver communication. Default is " "1954. Must be different if multiple receivers on same pc. Must be " "first command to set a receiver parameter. Multi command will " "automatically increment for individual modules."); - INTEGER_COMMAND(rx_fifodepth, getRxFifoDepth, setRxFifoDepth, StringTo, + INTEGER_COMMAND_VEC_ID(rx_fifodepth, getRxFifoDepth, setRxFifoDepth, StringTo, "[n_frames]\n\tSet the number of frames in the receiver " "fifo depth (buffer between listener and writer threads)."); - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( rx_silent, getRxSilentMode, setRxSilentMode, StringTo, "[0, 1]\n\tSwitch on or off receiver text output during acquisition."); - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( rx_discardpolicy, getRxFrameDiscardPolicy, setRxFrameDiscardPolicy, sls::StringTo, "[nodiscard (default)|discardempty|discardpartial(fastest)]\n\tFrame " @@ -1794,12 +1850,12 @@ class CmdProxy { "discardempty discards empty frames, discardpartial discards partial " "frames."); - INTEGER_COMMAND(rx_padding, getPartialFramesPadding, + INTEGER_COMMAND_VEC_ID(rx_padding, getPartialFramesPadding, setPartialFramesPadding, StringTo, "[0, 1]\n\tPartial frames padding enable in the " "receiver. Default: enabled. Disabling is fastest."); - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( rx_udpsocksize, getRxUDPSocketBufferSize, setRxUDPSocketBufferSize, StringTo, "[n_size]\n\tUDP socket buffer size in receiver. Tune rmem_default and " @@ -1809,7 +1865,7 @@ class CmdProxy { "\n\tActual udp socket buffer size. Double the size of " "rx_udpsocksize due to kernel bookkeeping."); - INTEGER_COMMAND(rx_lock, getRxLock, setRxLock, StringTo, + INTEGER_COMMAND_VEC_ID(rx_lock, getRxLock, setRxLock, StringTo, "[0, 1]\n\tLock receiver to one client IP, 1 locks, 0 " "unlocks. Default is unlocked. 1: locks"); @@ -1827,7 +1883,7 @@ class CmdProxy { /* File */ - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( fformat, getFileFormat, setFileFormat, sls::StringTo, "[binary|hdf5]\n\tFile format of data file. For HDF5, package must be " @@ -1843,11 +1899,11 @@ class CmdProxy { "is run. File name: [file name prefix]_d[detector " "index]_f[sub file index]_[acquisition/file index].raw."); - INTEGER_COMMAND(findex, getAcquisitionIndex, setAcquisitionIndex, + INTEGER_COMMAND_VEC_ID(findex, getAcquisitionIndex, setAcquisitionIndex, StringTo, "[n_value]\n\tFile or Acquisition index."); - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( fwrite, getFileWrite, setFileWrite, StringTo, "[0, 1]\n\tEnable or disable receiver file write. Default is 1."); @@ -1855,18 +1911,18 @@ class CmdProxy { fmaster, getMasterFileWrite, setMasterFileWrite, StringTo, "[0, 1]\n\tEnable or disable receiver master file. Default is 1."); - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( foverwrite, getFileOverWrite, setFileOverWrite, StringTo, "[0, 1]\n\tEnable or disable file overwriting. Default is 1."); - INTEGER_COMMAND(rx_framesperfile, getFramesPerFile, setFramesPerFile, + INTEGER_COMMAND_VEC_ID(rx_framesperfile, getFramesPerFile, setFramesPerFile, StringTo, "[n_frames]\n\tNumber of frames per file in receiver. 0 is " "infinite or all frames in single file."); /* ZMQ Streaming Parameters (Receiver<->Client) */ - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( rx_zmqstream, getRxZmqDataStream, setRxZmqDataStream, StringTo, "[0, 1]\n\tEnable/ disable data streaming from receiver via zmq (eg. " "to GUI or to another process for further processing). This creates/ " @@ -1875,7 +1931,7 @@ class CmdProxy { "to command line acquire will require disabling data streaming in " "receiver for fast applications. "); - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( rx_zmqfreq, getRxZmqFrequency, setRxZmqFrequency, StringTo, "[nth frame]\n\tFrequency of frames streamed out from receiver via " "zmq\n\tDefault: 1, Means every frame is streamed out. \n\tIf 2, every " @@ -1883,13 +1939,13 @@ class CmdProxy { "timeout, after which current frame is sent out. (default timeout is " "200 ms). Usually used for gui purposes."); - INTEGER_COMMAND(rx_zmqstartfnum, getRxZmqStartingFrame, + INTEGER_COMMAND_VEC_ID(rx_zmqstartfnum, getRxZmqStartingFrame, setRxZmqStartingFrame, StringTo, "[fnum]\n\tThe starting frame index to stream out. 0 by " "default, which streams the first frame in an acquisition, " "and then depending on the rx zmq frequency/ timer"); - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID_GET( rx_zmqport, getRxZmqPort, setRxZmqPort, StringTo, "[port]\n\tZmq port for data to be streamed out of the receiver. Also " "restarts receiver zmq streaming if enabled. Default is 30001. " @@ -1897,7 +1953,7 @@ class CmdProxy { "client(gui). Must be different for every detector (and udp port). " "Multi command will automatically increment for individual modules."); - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID_GET( zmqport, getClientZmqPort, setClientZmqPort, StringTo, "[port]\n\tZmq port in client(gui) or intermediate process for data to " "be streamed to from receiver. Default connects to receiver zmq " @@ -1907,14 +1963,14 @@ class CmdProxy { "port). Multi command will automatically increment for individual " "modules."); - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( rx_zmqip, getRxZmqIP, setRxZmqIP, IpAddr, "[x.x.x.x]\n\tZmq Ip Address from which data is to be streamed out of " "the receiver. Also restarts receiver zmq streaming if enabled. " "Default is from rx_hostname. Modified only when using an intermediate " "process between receiver."); - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( zmqip, getClientZmqIp, setClientZmqIp, IpAddr, "[x.x.x.x]\n\tIp Address to listen to zmq data streamed out from " "receiver or intermediate process. Default connects to " @@ -1937,23 +1993,23 @@ class CmdProxy { settingspath, getSettingsPath, setSettingsPath, "[path]\n\t[Eiger] Directory where settings files are loaded from/to."); - INTEGER_COMMAND(overflow, getOverFlowMode, setOverFlowMode, StringTo, + INTEGER_COMMAND_VEC_ID(overflow, getOverFlowMode, setOverFlowMode, StringTo, "[0, 1]\n\t[Eiger] Enable or disable show overflow flag in " "32 bit mode. Default is disabled."); - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( flippeddatax, getBottom, setBottom, StringTo, "[0, 1]\n\t[Eiger] Top or Bottom Half of Eiger module. 1 is bottom, 0 " "is top. Used to let Receivers and Gui know to flip the bottom image " "over the x axis. Files are not written without the flip however."); - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( readnlines, getPartialReadout, setPartialReadout, StringTo, "[1 - 256]\n\t[Eiger] Number of rows to readout per half module " "starting from the centre. 256 is default. The permissible values " "depend on dynamic range and 10Gbe enabled."); - INTEGER_COMMAND(interruptsubframe, getInterruptSubframe, + INTEGER_COMMAND_VEC_ID(interruptsubframe, getInterruptSubframe, setInterruptSubframe, StringTo, "[0, 1]\n\t[Eiger] 1 interrupts last subframe at required " "exposure time. 0 will wait for last sub frame to finish " @@ -1968,7 +2024,7 @@ class CmdProxy { "[(optional unit) ns|us|ms|s]\n\t[Eiger] Measured sub " "frame period between last sub frame and previous one."); - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( partialreset, getPartialReset, setPartialReset, StringTo, "[0, 1]\n\t[Eiger] Sets up detector to do partial or complete reset at " "start of acquisition. 0 complete reset, 1 partial reset. Default is " @@ -1976,7 +2032,7 @@ class CmdProxy { /* Jungfrau Specific */ - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( temp_threshold, getThresholdTemperature, setThresholdTemperature, StringTo, "[n_temp (in degrees)]\n\t[Jungfrau] Threshold temperature in degrees. " @@ -1985,7 +2041,7 @@ class CmdProxy { "occurs. To power on chip again, temperature has to be less than " "threshold temperature and temperature event has to be cleared."); - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( temp_control, getTemperatureControl, setTemperatureControl, StringTo, "[0, 1]\n\t[Jungfrau] Temperature control enable. Default is 0 " @@ -1995,7 +2051,7 @@ class CmdProxy { "to be less than threshold temperature and temperature event has to be " "cleared."); - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( auto_comp_disable, getAutoCompDisable, setAutoCompDisable, StringTo, "[0, 1]\n\t[Jungfrau] Auto comparator disable mode. By default, the " @@ -2012,7 +2068,7 @@ class CmdProxy { "0. For advanced users only. \n\tThe #images = #frames x #triggers x " "(#storagecells + 1)."); - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( storagecell_start, getStorageCellStart, setStorageCellStart, StringTo, "[0-15]\n\t[Jungfrau] Storage cell that stores the first acquisition " @@ -2040,53 +2096,53 @@ class CmdProxy { "[duration] [(optional unit) ns|us|ms|s]\n\t[Gotthard2] Burst " "period. Only in burst mode and auto timing mode."); - INTEGER_COMMAND(cdsgain, getCDSGain, setCDSGain, StringTo, + INTEGER_COMMAND_VEC_ID(cdsgain, getCDSGain, setCDSGain, StringTo, "[0, 1]\n\t[Gotthard2] Enable or disable CDS gain. Default " "is disabled."); - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( filter, getFilter, setFilter, StringTo, "[0|1|2|3]\n\t[Gotthard2] Set filter resistor. Default is 0."); - INTEGER_COMMAND(currentsource, getCurrentSource, setCurrentSource, + INTEGER_COMMAND_VEC_ID(currentsource, getCurrentSource, setCurrentSource, StringTo, "[0, 1]\n\t[Gotthard2] Enable or disable current source. " "Default is disabled."); - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( timingsource, getTimingSource, setTimingSource, sls::StringTo, "[internal|external]\n\t[Gotthard2] Timing source. Internal is crystal " "and external is system timing. Default is internal."); - INTEGER_COMMAND(veto, getVeto, setVeto, StringTo, + INTEGER_COMMAND_VEC_ID(veto, getVeto, setVeto, StringTo, "[0, 1]\n\t[Gotthard2] Enable or disable veto data " "streaming from detector. Default is 0."); /* Mythen3 Specific */ - INTEGER_COMMAND(gates, getNumberOfGates, setNumberOfGates, StringTo, + INTEGER_COMMAND_VEC_ID(gates, getNumberOfGates, setNumberOfGates, StringTo, "[n_gates]\n\t[Mythen3] Number of external gates in gating " "or trigger_gating mode (external gating)."); /* CTB/ Moench Specific */ - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( asamples, getNumberOfAnalogSamples, setNumberOfAnalogSamples, StringTo, "[n_samples]\n\t[CTB][Moench] Number of analog samples expected."); - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( adcclk, getADCClock, setADCClock, StringTo, "[n_clk in MHz]\n\t[Ctb][Moench] ADC clock frequency in MHz."); - INTEGER_COMMAND(runclk, getRUNClock, setRUNClock, StringTo, + INTEGER_COMMAND_VEC_ID(runclk, getRUNClock, setRUNClock, StringTo, "[n_clk in MHz]\n\t[Ctb][Moench] Run clock in MHz."); GET_COMMAND(syncclk, getSYNCClock, "[n_clk in MHz]\n\t[Ctb][Moench] Sync clock in MHz."); - INTEGER_COMMAND(adcpipeline, getADCPipeline, setADCPipeline, StringTo, + INTEGER_COMMAND_VEC_ID(adcpipeline, getADCPipeline, setADCPipeline, StringTo, "[n_value]\n\t[Ctb][Moench] Pipeline for ADC clock."); INTEGER_IND_COMMAND(v_limit, getVoltage, setVoltage, StringTo, @@ -2108,20 +2164,20 @@ class CmdProxy { /* CTB Specific */ - INTEGER_COMMAND(dsamples, getNumberOfDigitalSamples, + INTEGER_COMMAND_VEC_ID(dsamples, getNumberOfDigitalSamples, setNumberOfDigitalSamples, StringTo, "[n_value]\n\t[CTB] Number of digital samples expected."); - INTEGER_COMMAND(romode, getReadoutMode, setReadoutMode, + INTEGER_COMMAND_VEC_ID(romode, getReadoutMode, setReadoutMode, sls::StringTo, "[analog|digital|analog_digital]\n\t[CTB] Readout mode. " "Default is analog."); - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( dbitclk, getDBITClock, setDBITClock, StringTo, "[n_clk in MHz]\n\t[Ctb] Clock for latching the digital bits in MHz."); - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( dbitpipeline, getDBITPipeline, setDBITPipeline, StringTo, "[n_value]\n\t[Ctb] Pipeline of the clock for latching digital bits."); @@ -2182,22 +2238,22 @@ class CmdProxy { GET_IND_COMMAND(im_io, getMeasuredCurrent, defs::I_POWER_IO, "", "\n\t[Ctb] Measured current of power supply io in mA."); - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( extsampling, getExternalSampling, setExternalSampling, StringTo, "[0, 1]\n\t[Ctb] Enable for external sampling signal to extsamplingsrc " "signal for digital data. For advanced users only."); - INTEGER_COMMAND(extsamplingsrc, getExternalSamplingSource, + INTEGER_COMMAND_VEC_ID(extsamplingsrc, getExternalSamplingSource, setExternalSamplingSource, StringTo, "[0-63]\n\t[Ctb] Sampling source signal for digital data. " "For advanced users only."); - INTEGER_COMMAND(rx_dbitoffset, getRxDbitOffset, setRxDbitOffset, + INTEGER_COMMAND_VEC_ID(rx_dbitoffset, getRxDbitOffset, setRxDbitOffset, StringTo, "[n_bytes]\n\t[Ctb] Offset in bytes in digital data to " "skip in receiver."); - INTEGER_COMMAND(led, getLEDEnable, setLEDEnable, StringTo, + INTEGER_COMMAND_VEC_ID(led, getLEDEnable, setLEDEnable, StringTo, "[0, 1]\n\t[Ctb] Switches on/off all LEDs."); /* Pattern */ @@ -2253,17 +2309,17 @@ class CmdProxy { /* Insignificant */ - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( port, getControlPort, setControlPort, StringTo, "[n]\n\tPort number of the control server on detector for " "detector-client tcp interface. Default is 1952. Normally unchanged."); - INTEGER_COMMAND( + INTEGER_COMMAND_VEC_ID( stopport, getStopPort, setStopPort, StringTo, "[n]\n\tPort number of the stop server on detector for detector-client " "tcp interface. Default is 1953. Normally unchanged."); - INTEGER_COMMAND(lock, getDetectorLock, setDetectorLock, StringTo, + INTEGER_COMMAND_VEC_ID(lock, getDetectorLock, setDetectorLock, StringTo, "[0, 1]\n\tLock detector to one IP, 1: locks"); GET_COMMAND(