detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-22 17:47:59 +02:00
Code Issues Actions Packages Releases Activity

merge fix

Browse Source
This commit is contained in:
maliakal_d
2021-09-30 16:07:30 +02:00
parent 0b45fdfed8 1cbfa54b99
commit ce6dc589c8
6 changed files with 202 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/include/sls/Detector.h
View File

@ -1253,7 +1253,7 @@ class Detector {
/** [Jungfrau] Advanced */
Result<int> getFilterCell(Positions pos = {}) const;
/** [Jungfrau] Advanced Options[0-12]
/** [Jungfrau] Advanced Options[0-12], only for chip v1.1
*/
void setFilterCell(int cell, Positions pos = {});
@ -1380,7 +1380,7 @@ class Detector {
getVetoAlgorithm(const defs::streamingInterface value,
Positions pos = {}) const;
/** [Gotthard2] Options(vetoAlgorithm): ALG_HITS, ALG_RAW.
/** [Gotthard2] Options(vetoAlgorithm): ALG_HITS (default), ALG_RAW.
* Options(streamingInterface): LOW_LATENCY_LINK, ETHERNET_10GB */
void setVetoAlgorithm(const defs::vetoAlgorithm alg,
const defs::streamingInterface value,

2
slsDetectorSoftware/src/CmdProxy.cpp
View File

@ -2136,7 +2136,7 @@ std::string CmdProxy::VetoAlgorithm(int action) {
os << cmd << ' ';
if (action == defs::HELP_ACTION) {
os << "[hits|raw] [lll|10gbe]\n\t[Gotthard2] Set the veto "
"algorithm."
"algorithm. Default is hits."
<< '\n';
} else if (action == defs::GET_ACTION) {
if (args.size() != 1) {

2
slsDetectorSoftware/src/CmdProxy.h
View File

@ -1933,7 +1933,7 @@ class CmdProxy {
INTEGER_COMMAND_VEC_ID(
filtercell, getFilterCell, setFilterCell, sls::StringTo<int>,
"[0-12]\n\t[Jungfrau] Set Filter Cell. Advanced user Command");
"[0-12]\n\t[Jungfrau] Set Filter Cell. Only for chipv1.1. Advanced user Command");
/* Gotthard Specific */
TIME_GET_COMMAND(exptimel, getExptimeLeft,