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

WIP

Browse Source
This commit is contained in:
maliakal_d 2020-06-03 14:56:24 +02:00
parent 4053594c4d
commit 223e24f924
5 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
View File

@ -1622,9 +1622,6 @@ int setDetectorPosition(int pos[]) {
int *getDetectorPosition() { return detPos; } int *getDetectorPosition() { return detPos; }
int enableTenGigabitEthernet(int val) { int enableTenGigabitEthernet(int val) {
#ifdef VIRTUAL
return 0;
#endif
uint32_t addr = CONFIG_REG; uint32_t addr = CONFIG_REG;
// set // set

3
slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c
View File

@ -1255,9 +1255,6 @@ int setDetectorPosition(int pos[]) {
int *getDetectorPosition() { return detPos; } int *getDetectorPosition() { return detPos; }
int enableTenGigabitEthernet(int val) { int enableTenGigabitEthernet(int val) {
#ifdef VIRTUAL
return 0;
#endif
uint32_t addr = CONFIG_REG; uint32_t addr = CONFIG_REG;
// set // set

2
slsDetectorSoftware/src/DetectorImpl.cpp
View File

@ -357,7 +357,7 @@ void DetectorImpl::setGapPixelsinCallback(const bool enable) {
break; break;
default: default:
throw RuntimeError("Gap Pixels is not implemented for " + throw RuntimeError("Gap Pixels is not implemented for " +
multi_shm()->multiDetectorType); ToString(multi_shm()->multiDetectorType));
} }
} }
multi_shm()->gapPixels = enable; multi_shm()->gapPixels = enable;

13
slsDetectorSoftware/tests/test-CmdProxy-eiger.cpp
View File

@ -320,8 +320,6 @@ TEST_CASE("dr", "[.cmd][.new]") {
CmdProxy proxy(&det); CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash(); auto det_type = det.getDetectorType().squash();
if (det_type == defs::EIGER) { if (det_type == defs::EIGER) {
// The only detector currently supporting setting dr
// is EIGER?
auto dr = det.getDynamicRange().squash(); auto dr = det.getDynamicRange().squash();
std::array<int, 4> vals{4, 8, 16, 32}; std::array<int, 4> vals{4, 8, 16, 32};
for (const auto val : vals) { for (const auto val : vals) {
@ -332,6 +330,17 @@ TEST_CASE("dr", "[.cmd][.new]") {
REQUIRE(oss2.str() == "dr " + std::to_string(val) + '\n'); REQUIRE(oss2.str() == "dr " + std::to_string(val) + '\n');
} }
det.setDynamicRange(dr); det.setDynamicRange(dr);
} else if (det_type == defs::MYTHEN3) {
// not updated in firmware to support anything other than 32 at the
// moment
std::ostringstream oss1, oss2;
proxy.Call("dr", {"32"}, -1, PUT, oss1);
REQUIRE(oss1.str() == "dr 32\n");
proxy.Call("dr", {"32"}, -1, PUT, oss2);
REQUIRE(oss2.str() == "dr 32\n");
REQUIRE_THROWS(proxy.Call("dr", {"4"}, -1, PUT));
REQUIRE_THROWS(proxy.Call("dr", {"8"}, -1, PUT));
REQUIRE_THROWS(proxy.Call("dr", {"16"}, -1, PUT));
} else { } else {
// For the other detectors we should get an error message // For the other detectors we should get an error message
// except for dr 16 // except for dr 16

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

@ -1173,7 +1173,17 @@ TEST_CASE("gappixels", "[.cmd][.new]") {
} }
det.setGapPixelsinCallback(prev_val); det.setGapPixelsinCallback(prev_val);
} else { } else {
REQUIRE_THROWS(proxy.Call("gappixels", {}, -1, GET)); {
std::ostringstream oss;
proxy.Call("gappixels", {}, -1, GET, oss);
REQUIRE(oss.str() == "gappixels 0\n");
}
{
std::ostringstream oss;
proxy.Call("gappixels", {"0"}, -1, PUT, oss);
REQUIRE(oss.str() == "gappixels 0\n");
}
REQUIRE_THROWS(proxy.Call("gappixels", {"1"}, -1, PUT));
} }
} }
@ -1355,7 +1365,8 @@ TEST_CASE("tengiga", "[.cmd][.new]") {
CmdProxy proxy(&det); CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash(); auto det_type = det.getDetectorType().squash();
if (det_type == defs::EIGER || det_type == defs::CHIPTESTBOARD) { if (det_type == defs::EIGER || det_type == defs::CHIPTESTBOARD ||
det_type == defs::MOENCH) {
auto tengiga = det.getTenGiga(); auto tengiga = det.getTenGiga();
det.setTenGiga(false); det.setTenGiga(false);