Loading sas_temper/param.py +5 −5 Original line number Diff line number Diff line Loading @@ -25,7 +25,7 @@ import math as m import sas_temper.polydispersity as pd class Param(object): def __init__(self, name, kind, min, max, coupled=None, polydispersity=None, pd_min=None, pd_max=None): def __init__(self, name, kind, minv, maxv, coupled=None, polydispersity=None, pd_min=None, pd_max=None): self.name = str(name) # string: the name of the parameter if kind in ["linear","log","integer","coupled","fixed"]: Loading @@ -36,13 +36,13 @@ class Param(object): raise Exception(err_message) if kind in ["integer"]: self.min = min self.max = max self.min = minv self.max = maxv self.val = int(0.5*self.min+self.max) self.unc = 0.0 else: self.min = np.float64(min) # the minimum value self.max = np.float64(max) # the maximum value self.min = np.float64(minv) # the minimum value self.max = np.float64(maxv) # the maximum value self.val = 0.5*(self.min + self.max) self.unc = 0.0 Loading Loading
sas_temper/param.py +5 −5 Original line number Diff line number Diff line Loading @@ -25,7 +25,7 @@ import math as m import sas_temper.polydispersity as pd class Param(object): def __init__(self, name, kind, min, max, coupled=None, polydispersity=None, pd_min=None, pd_max=None): def __init__(self, name, kind, minv, maxv, coupled=None, polydispersity=None, pd_min=None, pd_max=None): self.name = str(name) # string: the name of the parameter if kind in ["linear","log","integer","coupled","fixed"]: Loading @@ -36,13 +36,13 @@ class Param(object): raise Exception(err_message) if kind in ["integer"]: self.min = min self.max = max self.min = minv self.max = maxv self.val = int(0.5*self.min+self.max) self.unc = 0.0 else: self.min = np.float64(min) # the minimum value self.max = np.float64(max) # the maximum value self.min = np.float64(minv) # the minimum value self.max = np.float64(maxv) # the maximum value self.val = 0.5*(self.min + self.max) self.unc = 0.0 Loading
