Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer

python/slsdet/detector.py

@@ -119,9 +119,10 @@ class Detector(CppDetectorApi):
         return NotImplementedError("parameters is set only")
 
     @parameters.setter
-    def parameters(self, fname):
-        fname = ut.make_string_path(fname)
-        self.loadParameters(fname)
+    def parameters(self, value):
+        if isinstance(value, str):
+            value = ut.make_string_path(value)
+        self.loadParameters(value)
 
     @property
     def hostname(self):
@@ -873,6 +874,8 @@ class Detector(CppDetectorApi):
 
     @ratecorr.setter
     def ratecorr(self, tau):
+        if isinstance(tau, int):
+            tau = float(tau)
         self.setRateCorrection(tau)
 
     @property

python/src/detector.cpp

@@ -36,6 +36,10 @@ void init_det(py::module &m) {
              (void (Detector::*)(const std::string &)) &
                  Detector::loadParameters,
              py::arg())
+        .def("loadParameters",
+             (void (Detector::*)(const std::vector<std::string> &)) &
+                 Detector::loadParameters,
+             py::arg())
         .def("getHostname",
              (Result<std::string>(Detector::*)(sls::Positions) const) &
                  Detector::getHostname,