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

This commit is contained in:
2020-08-27 17:58:21 +02:00
6 changed files with 37 additions and 22 deletions

View File

@ -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