From b112cf81c4c56a50e60737a71fdb295dedb07db9 Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Thu, 24 Mar 2022 17:46:20 +0100 Subject: [PATCH] fixed daclist setter --- python/slsdet/detector.py | 4 ++++ slsDetectorSoftware/src/Detector.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/python/slsdet/detector.py b/python/slsdet/detector.py index 25715e61a..d94d82995 100755 --- a/python/slsdet/detector.py +++ b/python/slsdet/detector.py @@ -1578,6 +1578,10 @@ class Detector(CppDetectorApi): """ return self.getDacNames() + @daclist.setter + def daclist(self, value): + self.setDacNames(value) + @property def dacvalues(self): """Gets the dac values for every dac for this detector.""" diff --git a/slsDetectorSoftware/src/Detector.cpp b/slsDetectorSoftware/src/Detector.cpp index 8ad11ce82..5e9966860 100644 --- a/slsDetectorSoftware/src/Detector.cpp +++ b/slsDetectorSoftware/src/Detector.cpp @@ -2104,7 +2104,7 @@ defs::dacIndex Detector::decodeNamedDac(const std::string &name) { std::string Detector::decodeNamedDac(defs::dacIndex i) { auto names = getDacNames(); auto index = static_cast(i); - if (index > names.size()) + if (index >= names.size()) throw RuntimeError("Dac index out of range"); return names[index]; }