detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-28 09:10:01 +02:00
Code Issues Actions Packages Releases Activity

wip

Browse Source
This commit is contained in:
maliakal_d 2021-10-06 17:51:25 +02:00
parent fcfbb7040a
commit e2d7d12b3e
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -2047,17 +2047,17 @@ int setAllTrimbits(int val) {
} }
int getAllTrimbits() { int getAllTrimbits() {
int value = *((detectorModules->chanregs));
if (detectorModules) { if (detectorModules) {
int value = (*((detectorModules->chanregs)));
for (int ichan = 0; ichan < (detectorModules->nchan); ichan++) { for (int ichan = 0; ichan < (detectorModules->nchan); ichan++) {
if (*((detectorModules->chanregs) + ichan) != value) { if (*((detectorModules->chanregs) + ichan) != value) {
value = -1; return -1;
break;
} }
} }
LOG(logINFO, ("Value of all Trimbits: %d\n", value));
return value;
} }
LOG(logINFO, ("Value of all Trimbits: %d\n", value)); return -1;
return value;
} }
int getBebFPGATemp() { int getBebFPGATemp() {

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

@ -287,7 +287,7 @@ TEST_CASE("comp_disable_time", "[.cmd]") {
Detector det; Detector det;
CmdProxy proxy(&det); CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash(); auto det_type = det.getDetectorType().squash();
if (det_type == defs::JUNGFRAU) { if (det_type == defs::JUNGFRAU && det.getChipVersion().squash()*10 == 11) {
auto prev_val = det.getComparatorDisableTime(); auto prev_val = det.getComparatorDisableTime();
{ {
std::ostringstream oss; std::ostringstream oss;

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

@ -345,7 +345,7 @@ TEST_CASE("thresholdnotb", "[.cmd]") {
std::string senergy = std::to_string(prev_energies[0]); std::string senergy = std::to_string(prev_energies[0]);
std::ostringstream oss1, oss2; std::ostringstream oss1, oss2;
proxy.Call("thresholdnotb", {senergy, "standard"}, -1, PUT, oss1); proxy.Call("thresholdnotb", {senergy, "standard"}, -1, PUT, oss1);
REQUIRE(oss1.str() == "threshold [" + senergy + ", standard]\n"); REQUIRE(oss1.str() == "thresholdnotb [" + senergy + ", standard]\n");
proxy.Call("threshold", {}, -1, GET, oss2); proxy.Call("threshold", {}, -1, GET, oss2);
REQUIRE(oss2.str() == "threshold " + senergy + "\n"); REQUIRE(oss2.str() == "threshold " + senergy + "\n");
REQUIRE_THROWS(proxy.Call("thresholdnotb", REQUIRE_THROWS(proxy.Call("thresholdnotb",