Changes in park-1.2.1/park/parameter.py [fb7180c:3570545] in sasview

File:

• park-1.2.1/park/parameter.py (modified) (5 diffs)

park-1.2.1/park/parameter.py

@@ -15 +15 @@
 __all__ = ['Parameter', 'ParameterSet']
 
-import math
 import numpy
 import expression        
@@ -163 +162 @@
         """
         range = ['.']*10
-        lo,hi = self.range
-        portion = (self.value-lo)/(hi-lo)
+        lo,hi = p.range
+        portion = (p.value-lo)/(hi-lo)
         if portion < 0: portion = 0.
         elif portion >= 1: portion = 0.99999999
@@ -170 +169 @@
         range[bar] = '|'
         range = "".join(range)
-        return "%25s %s %g in [%g,%g]"  % (self.name,range,self.value,lo,hi)
+        return "%25s %s %g in [%g,%g]"  % (p.name,range,p.value,lo,hi)
 
     def isfitted(self): return self.status == 'fitted'
@@ -274 +273 @@
         for p in self:
             if parts[1] == p.name:
-                if len(parts) == 2:
+                if len(pars) == 2:
                     return p
                 elif isinstance(p, ParameterSet):
                     return p._byname(parts[1:])
-                else:
-                    raise
         return None
 
@@ -286 +283 @@
         parts = name.split('.')
         if parts[0] == self.name:
-            p =  self._byname(name.split('.'))
+            p =  _byname(self, name.split('.'))
             if p: return p
         raise KeyError("parameter %s not in parameter set"%name)