detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 14:36:49 +01:00
Code Issues Actions Packages Releases Activity

jungfrau: new default to asic reg for chipv1.1, filtercells name change, wrongnumberof parameters message change

Browse Source
This commit is contained in:
maliakal_d
2021-10-21 11:27:31 +02:00
parent f7a6160e67
commit 9b321d2ee1
5 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
slsDetectorSoftware/src/CmdProxy.cpp
View File

@@ -82,8 +82,13 @@ std::map<std::string, std::string> CmdProxy::GetDepreciatedCommands() {
}
void CmdProxy::WrongNumberOfParameters(size_t expected) {
if (expected == 0) {
throw RuntimeError("Command " + cmd +
" expected no parameter/s but got " +
std::to_string(args.size()) + "\n");
}
throw RuntimeError(
"Command " + cmd + " expected <=" + std::to_string(expected) +
"Command " + cmd + " expected >=" + std::to_string(expected) +
" parameter/s but got " + std::to_string(args.size()) + "\n");
}

4
slsDetectorSoftware/src/CmdProxy.h
View File

@@ -948,7 +948,7 @@ class CmdProxy {
{"storagecell_start", &CmdProxy::storagecell_start},
{"storagecell_delay", &CmdProxy::storagecell_delay},
{"gainmode", &CmdProxy::gainmode},
{"filtercell", &CmdProxy::filtercell},
{"filtercells", &CmdProxy::filtercells},
/* Gotthard Specific */
{"roi", &CmdProxy::ROI},
@@ -1951,7 +1951,7 @@ class CmdProxy {
"Jungfrau] Gain mode.\n\tCAUTION: Do not use fixg0 without caution, "
"you can damage the detector!!!");
INTEGER_COMMAND_VEC_ID(filtercell, getFilterCell, setFilterCell,
INTEGER_COMMAND_VEC_ID(filtercells, getFilterCell, setFilterCell,
sls::StringTo<int>,
"[0-12]\n\t[Jungfrau] Set Filter Cell. Only for "
"chipv1.1. Advanced user Command");