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

G2hdi (#510)

Browse Source 
* g2: new hdi values, write hdi value to reg, set slave/master to reg, able to set master from server config file, server command line and client

* print versions for virtual as well
This commit is contained in:
Dhanya Thattil
2022-08-16 09:31:13 +02:00
committed by GitHub
parent 409a3977db
commit 22b9562629
24 changed files with 251 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -197,10 +197,11 @@ class Detector {
*/
void setFlipRows(bool value, Positions pos = {});
/** [Eiger][Mythen3][Gotthard1] via stop server **/
/** [Eiger][Mythen3][Gotthard1][Gotthard2] via stop server **/
Result<bool> getMaster(Positions pos = {}) const;
/** [Eiger] Set half module to master and the others to slaves */
/** [Eiger][Gotthard2] Set (half) module to master and the other(s) to
* slaves */
void setMaster(bool value, int pos);
Result<bool> isVirtualDetectorServer(Positions pos = {}) const;

6
slsDetectorSoftware/src/CmdProxy.h
View File

@ -1298,9 +1298,9 @@ class CmdProxy {
INTEGER_COMMAND_VEC_ID_GET(
master, getMaster, setMaster, StringTo<int>,
"[0, 1]\n\t[Eiger] Sets half module to master and "
"others to slaves.\n\t[Gotthard][Gotthard2][Mythen3][Eiger] "
"Gets if the current module/ half module is master.");
"[0, 1]\n\t[Eiger][Gotthard2] Sets (half) module to master and "
"other(s) to slaves.\n\t[Gotthard][Gotthard2][Mythen3][Eiger] "
"Gets if the current (half) module is master.");
/* acquisition parameters */

2
slsDetectorSoftware/tests/test-CmdProxy.cpp
View File

@ -586,7 +586,7 @@ TEST_CASE("master", "[.cmd]") {
if (det_type == defs::EIGER || det_type == defs::MYTHEN3 ||
det_type == defs::GOTTHARD || det_type == defs::GOTTHARD2) {
REQUIRE_NOTHROW(proxy.Call("master", {}, -1, GET));
if (det_type == defs::EIGER) {
if (det_type == defs::EIGER || det_type == defs::GOTTHARD2) {
// get previous master
int prevMaster = 0;
{