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

datastream help, versions fix for eiger (hardwareversion not impl), fix for tests

Browse Source
This commit is contained in:
maliakal_d
2022-12-05 13:09:52 +01:00
parent ad21d76af2
commit 34a43bcb67
6 changed files with 82 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/src/CmdProxy.cpp
View File

@ -274,12 +274,13 @@ std::string CmdProxy::Versions(int action) {
if (!args.empty()) {
WrongNumberOfParameters(0);
}
bool eiger = (det->getDetectorType().squash() == defs::EIGER);
auto t = det->getFirmwareVersion(std::vector<int>{det_id});
os << "\nType : " << OutString(det->getDetectorType())
<< "\nRelease : " << det->getPackageVersion() << std::hex
<< "\nClient : " << det->getClientVersion();
os << "\nFirmware : ";
if (det->getDetectorType().squash() == defs::EIGER) {
if (eiger) {
os << OutString(t);
} else {
os << OutStringHex(t);
@ -287,6 +288,7 @@ std::string CmdProxy::Versions(int action) {
os << "\nServer : "
<< OutString(
det->getDetectorServerVersion(std::vector<int>{det_id}));
if (!eiger)
os << "\nHardware : "
<< OutString(det->getHardwareVersion(std::vector<int>{det_id}));
os << "\nKernel : "

2
slsDetectorSoftware/src/CmdProxy.h
View File

@ -1599,7 +1599,7 @@ class CmdProxy {
"data from detector. Default: 1.\n\tAlso enables second interface in "
"receiver for listening (Writes a file per interface if writing "
"enabled).\n\tAlso restarts client and receiver zmq sockets if zmq "
"streaming enabled.");
"streaming enabled.\n\t[Eiger] Only gets with result 2.");
INTEGER_COMMAND_VEC_ID(
selinterface, getSelectedUDPInterface, selectUDPInterface,