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

Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer

Browse Source
This commit is contained in:
Erik Frojdh 2020-09-10 17:08:55 +02:00
commit d4cff5b99c
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/src/CmdProxy.cpp
View File

@ -670,7 +670,7 @@ std::string CmdProxy::ClockFrequency(int action) {
std::ostringstream os; std::ostringstream os;
os << cmd << ' '; os << cmd << ' ';
if (action == defs::HELP_ACTION) { if (action == defs::HELP_ACTION) {
os << "[n_clock (0-8)] [freq_in_Hz]\n\t[Gotthard2][Mythen3] Frequency " os << "[n_clock (0-5)] [freq_in_Hz]\n\t[Gotthard2][Mythen3] Frequency "
"of clock n_clock in Hz. Use clkdiv to set frequency." "of clock n_clock in Hz. Use clkdiv to set frequency."
<< '\n'; << '\n';
} else { } else {
@ -703,7 +703,7 @@ std::string CmdProxy::ClockPhase(int action) {
std::ostringstream os; std::ostringstream os;
os << cmd << ' '; os << cmd << ' ';
if (action == defs::HELP_ACTION) { if (action == defs::HELP_ACTION) {
os << "[n_clock (0-8)] [phase] [deg " os << "[n_clock (0-5)] [phase] [deg "
"(optional)]\n\t[Gotthard2][Mythen3] Phase of clock n_clock. If " "(optional)]\n\t[Gotthard2][Mythen3] Phase of clock n_clock. If "
"deg, then phase shift in degrees, else absolute phase shift " "deg, then phase shift in degrees, else absolute phase shift "
"values." "values."
@ -756,7 +756,7 @@ std::string CmdProxy::MaxClockPhaseShift(int action) {
std::ostringstream os; std::ostringstream os;
os << cmd << ' '; os << cmd << ' ';
if (action == defs::HELP_ACTION) { if (action == defs::HELP_ACTION) {
os << "[n_clock (0-8)]\n\t[Gotthard2][Mythen3] Absolute Maximum Phase " os << "[n_clock (0-5)]\n\t[Gotthard2][Mythen3] Absolute Maximum Phase "
"shift of clock n_clock." "shift of clock n_clock."
<< '\n'; << '\n';
} else { } else {
@ -785,7 +785,7 @@ std::string CmdProxy::ClockDivider(int action) {
std::ostringstream os; std::ostringstream os;
os << cmd << ' '; os << cmd << ' ';
if (action == defs::HELP_ACTION) { if (action == defs::HELP_ACTION) {
os << "[n_clock (0-8)] [n_divider]\n\t[Gotthard2][Mythen3] Clock " os << "[n_clock (0-5)] [n_divider]\n\t[Gotthard2][Mythen3] Clock "
"Divider of clock n_clock. Must be greater than 1." "Divider of clock n_clock. Must be greater than 1."
<< '\n'; << '\n';
} else { } else {
@ -1975,7 +1975,7 @@ std::string CmdProxy::SlowAdc(int action) {
result[i] = t[i] / 1000.00; result[i] = t[i] / 1000.00;
} }
os << OutString(result) << " mV\n"; os << OutString(result) << " mV\n";
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
throw sls::RuntimeError("cannot put"); throw sls::RuntimeError("cannot put");
} else { } else {

3
slsDetectorSoftware/src/CmdProxy.h
View File

@ -650,6 +650,7 @@ class CmdProxy {
{"rx_version", &CmdProxy::rx_version}, {"rx_version", &CmdProxy::rx_version},
{"detectornumber", &CmdProxy::detectornumber}, {"detectornumber", &CmdProxy::detectornumber},
{"type", &CmdProxy::type}, {"type", &CmdProxy::type},
{"nmod", &CmdProxy::nmod},
{"detsize", &CmdProxy::DetectorSize}, {"detsize", &CmdProxy::DetectorSize},
{"settingslist", &CmdProxy::settingslist}, {"settingslist", &CmdProxy::settingslist},
{"settings", &CmdProxy::settings}, {"settings", &CmdProxy::settings},
@ -1126,6 +1127,8 @@ class CmdProxy {
GET_COMMAND(type, getDetectorType, GET_COMMAND(type, getDetectorType,
"\n\tSerial number or MAC of detector (hex)."); "\n\tSerial number or MAC of detector (hex).");
GET_COMMAND_NOID(nmod, size, "\n\tNumber of modules in shared memory.");
GET_COMMAND_NOID(settingslist, getSettingsList, GET_COMMAND_NOID(settingslist, getSettingsList,
"\n\tList of settings implemented for this detector."); "\n\tList of settings implemented for this detector.");