From 498569a42af7d522ac96d7e8f0254ff3cf0fb4e6 Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Thu, 4 Apr 2019 12:31:46 +0200 Subject: [PATCH] update for trimEn --- python/src/Detector.h | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/python/src/Detector.h b/python/src/Detector.h index 72a01e61c..e90075e64 100644 --- a/python/src/Detector.h +++ b/python/src/Detector.h @@ -386,17 +386,11 @@ class Detector { //Eiger: set the energies where the detector is trimmed void setTrimEnergies(std::vector energy) { - det.setTrimEn(energy.size(), energy.data()); + det.setTrimEn(energy); } std::vector getTrimEnergies() { - //initial call to get legth, energies defaults to NULL - auto n_trimen = det.getTrimEn(); - std::vector 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(det.setThresholdTemperature(-1, -1)) / 1000.0; + return static_cast(det.setThresholdTemperature(-1, -1)) / 1000.0; } void setTemperatureControl(bool v) {