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

moench speeds (#776)

Browse Source 
* added other speeds and updated readoutspeedlist, test, gui
This commit is contained in:
maliakal_d
2023-07-10 15:09:51 +02:00
committed by GitHub
parent 58cdb5bd20
commit 5be503c1bd
11 changed files with 62 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorSoftware/src/CmdProxy.cpp
View File

@ -708,8 +708,7 @@ std::string CmdProxy::ReadoutSpeed(int action) {
"full_speed option only available from v2.0 boards and is "
"recommended to set number of interfaces to 2. Also overwrites "
"adcphase to recommended default.\n\t [144|108]\n\t\t[Gotthard2] "
"Readout speed of chip in MHz. Default is 108.\n\t\t[Moench] "
"Only Full speed is implemented."
"Readout speed of chip in MHz. Default is 108."
<< '\n';
} else {
defs::detectorType type = det->getDetectorType().squash();

3
slsDetectorSoftware/src/Detector.cpp
View File

@ -506,10 +506,9 @@ std::vector<defs::speedLevel> Detector::getReadoutSpeedList() const {
switch (getDetectorType().squash()) {
case defs::EIGER:
case defs::JUNGFRAU:
case defs::MOENCH:
return std::vector<defs::speedLevel>{defs::FULL_SPEED, defs::HALF_SPEED,
defs::QUARTER_SPEED};
case defs::MOENCH:
return std::vector<defs::speedLevel>{defs::FULL_SPEED};
case defs::GOTTHARD2:
return std::vector<defs::speedLevel>{defs::G2_108MHZ, defs::G2_144MHZ};
default:

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

@ -1050,9 +1050,9 @@ TEST_CASE("readoutspeed", "[.cmd]") {
// full speed for jungfrau/moench only works for new boards (chipv1.1 is
// with new board [hw1.0 and chipv1.0 not tested here])
if (((det_type == defs::JUNGFRAU || det_type == defs::MOENCH) &&
if (((det_type == defs::JUNGFRAU) &&
det.getChipVersion().squash() * 10 == 11) ||
(det_type == defs::EIGER)) {
(det_type == defs::EIGER) || (det_type == defs::MOENCH)) {
std::ostringstream oss1, oss2, oss3, oss4;
proxy.Call("readoutspeed", {"0"}, -1, PUT, oss1);
REQUIRE(oss1.str() == "readoutspeed full_speed\n");