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

update for trimEn

Browse Source
This commit is contained in:
Erik Frojdh 2019-04-04 12:31:46 +02:00
parent d6360ca197
commit 498569a42a
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
python/src/Detector.h
View File

@ -386,17 +386,11 @@ class Detector {
//Eiger: set the energies where the detector is trimmed
void setTrimEnergies(std::vector<int> energy) {
det.setTrimEn(energy.size(), energy.data());
det.setTrimEn(energy);
}
std::vector<int> getTrimEnergies() {
//initial call to get legth, energies defaults to NULL
auto n_trimen = det.getTrimEn();
std::vector<int> trim_energies(n_trimen);
//second call to get the energies
det.getTrimEn(trim_energies.data());
return trim_energies;
return det.getTrimEn();
}
/*** Temperature control functions for Jungfrau ***/
@ -405,7 +399,7 @@ class Detector {
}
float getThresholdTemperature() {
return static_cast<float>(det.setThresholdTemperature(-1, -1)) / 1000.0;
return static_cast<double>(det.setThresholdTemperature(-1, -1)) / 1000.0;
}
void setTemperatureControl(bool v) {