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

bug fixes for tests

Browse Source
This commit is contained in:
maliakal_d
2019-10-22 15:46:28 +02:00
parent 45012df95b
commit 8006043a97
6 changed files with 111 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/src/CmdProxy.cpp
View File

@ -789,7 +789,7 @@ std::string CmdProxy::TemperatureEvent(int action) {
if (args.size() != 1) {
WrongNumberOfParameters(1);
}
if (std::stoi(args[1]) != 0) {
if (std::stoi(args[0]) != 0) {
throw sls::RuntimeError("Unknown argument for temp event. Did you mean 0 to reset event?");
}
det->resetTemperatureEvent();

6
slsDetectorSoftware/src/slsDetector.cpp
View File

@ -2393,6 +2393,9 @@ int slsDetector::enableGapPixels(int val) {
}
int slsDetector::setTrimEn(std::vector<int> energies) {
if (shm()->myDetectorType != EIGER) {
throw RuntimeError("Not implemented for this detector.");
}
if (energies.size() > MAX_TRIMEN) {
std::ostringstream os;
os << "Size of trim energies: " << energies.size()
@ -2405,6 +2408,9 @@ int slsDetector::setTrimEn(std::vector<int> energies) {
}
std::vector<int> slsDetector::getTrimEn() {
if (shm()->myDetectorType != EIGER) {
throw RuntimeError("Not implemented for this detector.");
}
return std::vector<int>(shm()->trimEnergies.begin(),
shm()->trimEnergies.end());
}