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

minor

Browse Source
This commit is contained in:
maliakal_d 2021-09-30 17:24:06 +02:00
parent 1cbfa54b99
commit ee7ae9d947
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
slsDetectorSoftware/src/CmdProxy.cpp
View File

@ -207,7 +207,8 @@ std::string CmdProxy::Acquire(int action) {
"detector acquisition for number of frames set\n\t- monitors " "detector acquisition for number of frames set\n\t- monitors "
"detector status from running to idle\n\t- stops the receiver " "detector status from running to idle\n\t- stops the receiver "
"listener (if enabled)\n\t- increments file index if file write " "listener (if enabled)\n\t- increments file index if file write "
"enabled\n\t- resets acquiring flag"; "enabled\n\t- resets acquiring flag"
<< '\n';
} else { } else {
if (det->empty()) { if (det->empty()) {
throw sls::RuntimeError( throw sls::RuntimeError(
@ -964,9 +965,9 @@ std::string CmdProxy::CurrentSource(int action) {
std::ostringstream os; std::ostringstream os;
os << cmd << ' '; os << cmd << ' ';
if (action == defs::HELP_ACTION) { if (action == defs::HELP_ACTION) {
os << "[0|1]\n\t[Gotthard2] Enable or disable current source. Default " os << "\n\t[0|1]\n\t\t[Gotthard2] Enable or disable current source. Default "
"is disabled.\n[0|1] [fix|nofix] [select source] [(only for " "is disabled.\n\t[0|1] [fix|nofix] [select source] [(only for "
"chipv1.1)normal|low]\n\t[Jungfrau] Disable or enable current " "chipv1.1)normal|low]\n\t\t[Jungfrau] Disable or enable current "
"source with some parameters. The select source is 0-63 for " "source with some parameters. The select source is 0-63 for "
"chipv1.0 and a 64 bit mask for chipv1.1. To disable, one needs " "chipv1.0 and a 64 bit mask for chipv1.1. To disable, one needs "
"only one argument '0'." "only one argument '0'."
@ -1337,9 +1338,9 @@ std::string CmdProxy::Trigger(int action) {
os << cmd << ' '; os << cmd << ' ';
if (action == defs::HELP_ACTION) { if (action == defs::HELP_ACTION) {
if (cmd == "trigger") { if (cmd == "trigger") {
os << "[Eiger][Mythen3] Sends software trigger signal to detector"; os << "\n\t[Eiger][Mythen3] Sends software trigger signal to detector";
} else if (cmd == "blockingtrigger") { } else if (cmd == "blockingtrigger") {
os << "[Eiger] Sends software trigger signal to detector and " os << "\n\t[Eiger] Sends software trigger signal to detector and "
"blocks till " "blocks till "
"the frames are sent out for that trigger."; "the frames are sent out for that trigger.";
} else { } else {
@ -1423,9 +1424,9 @@ std::string CmdProxy::UDPDestinationList(int action) {
std::ostringstream os; std::ostringstream os;
os << cmd << ' '; os << cmd << ' ';
if (action == defs::HELP_ACTION) { if (action == defs::HELP_ACTION) {
os << "[entry=n_val] [ip=x.x.x.x] [(optional)ip2=x.x.x.x] " os << "[ip=x.x.x.x] [(optional)ip2=x.x.x.x] "
"\n[mac=xx:xx:xx:xx:xx:xx] " "\n\t[mac=xx:xx:xx:xx:xx:xx] "
"[(optional)mac2=xx:xx:xx:xx:xx:xx]\n[port=value] " "[(optional)mac2=xx:xx:xx:xx:xx:xx]\n\t[port=value] "
"[(optional)port2=value\n\tThe order of ip, mac and port does " "[(optional)port2=value\n\tThe order of ip, mac and port does "
"not matter. entry_value can be >0 only for Eiger and Jungfrau " "not matter. entry_value can be >0 only for Eiger and Jungfrau "
"where round robin is implemented. If 'auto' used, then ip is " "where round robin is implemented. If 'auto' used, then ip is "
@ -1607,8 +1608,8 @@ std::string CmdProxy::ZMQHWM(int action) {
if (action == defs::HELP_ACTION) { if (action == defs::HELP_ACTION) {
os << "[n_limit] \n\tClient's zmq receive high water mark. Default is " os << "[n_limit] \n\tClient's zmq receive high water mark. Default is "
"the zmq library's default (1000), can also be set here using " "the zmq library's default (1000), can also be set here using "
"-1. \n This is a high number and can be set to 2 for gui " "-1. \n\tThis is a high number and can be set to 2 for gui "
"purposes. \n One must also set the receiver's send high water " "purposes. \n\tOne must also set the receiver's send high water "
"mark to similar value. Final effect is sum of them.\n\t Setting " "mark to similar value. Final effect is sum of them.\n\t Setting "
"it via command line is useful only before zmq enabled (before " "it via command line is useful only before zmq enabled (before "
"opening gui)." "opening gui)."

4
slsDetectorSoftware/src/CmdProxy.h
View File

@ -1381,9 +1381,9 @@ class CmdProxy {
INTEGER_COMMAND_VEC_ID( INTEGER_COMMAND_VEC_ID(
readnrows, getReadNRows, setReadNRows, StringTo<int>, readnrows, getReadNRows, setReadNRows, StringTo<int>,
"[1 - 256]\n\t[Eiger] Number of rows to readout per half module " "\n\t[1-256]\n\t\t[Eiger] Number of rows to readout per half module "
"starting from the centre. Options: 0 - 256. 256 is default. The " "starting from the centre. Options: 0 - 256. 256 is default. The "
"permissible values depend on dynamic range and 10Gbe enabled.\n[8-512 (multiple of 8)]\n\t[Jungfrau] Number of rows per module starting from the centre. Options: 8 - 512, must be multiples of 8. Default is 512."); "permissible values depend on dynamic range and 10Gbe enabled.\n\t[8-512 (multiple of 8)]\n\t\t[Jungfrau] Number of rows per module starting from the centre. Options: 8 - 512, must be multiples of 8. Default is 512.");
/** temperature */ /** temperature */
GET_COMMAND_NOID( GET_COMMAND_NOID(