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

jungfrau module id (#581)

Browse Source 
* connected module id to detid_jungfrau.txt
* fixed module id register in jungfrau
This commit is contained in:
Dhanya Thattil
2022-11-23 12:01:22 +01:00
committed by GitHub
parent 8dbcfc2ca8
commit 911b2f678f
14 changed files with 126 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,8 +85,8 @@ class Detector {
/* [Jungfrau][Gotthard][Mythen3][Gotthard2][CTB][Moench] */
Result<int64_t> getSerialNumber(Positions pos = {}) const;
/** [Eiger][Gotthard2][Mythen3] 6 bit value (ideally unique) that is
* streamed out in the UDP header of the detector.*/
/** [Eiger][Gotthard2][Mythen3][Jungfrau] 6 bit value (ideally unique) that
* is streamed out in the UDP header of the detector.*/
Result<int> getModuleId(Positions pos = {}) const;
Result<std::string> getReceiverVersion(Positions pos = {}) const;

6
slsDetectorSoftware/src/CmdProxy.h
View File

@ -1246,9 +1246,9 @@ class CmdProxy {
"Serial number of detector.");
GET_COMMAND(moduleid, getModuleId,
"\n\t[Gotthard2][Eiger][Mythen3] 16 bit value (ideally unique) "
"that is streamed out in the UDP header of the detector. "
"Picked up from a file on the module.");
"\n\t[Gotthard2][Eiger][Mythen3][Jungfrau] 16 bit value "
"(ideally unique) that is streamed out in the UDP header of "
"the detector. Picked up from a file on the module.");
GET_COMMAND(type, getDetectorType,
"\n\tReturns detector type. Can be Eiger, Jungfrau, Gotthard, "

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

@ -137,7 +137,7 @@ TEST_CASE("moduleid", "[.cmd]") {
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
if (det_type == defs::GOTTHARD2 || det_type == defs::MYTHEN3 ||
det_type == defs::EIGER) {
det_type == defs::EIGER || det_type == defs::JUNGFRAU) {
REQUIRE_NOTHROW(proxy.Call("moduleid", {}, -1, GET));
} else {
REQUIRE_THROWS(proxy.Call("moduleid", {}, -1, GET));