Changes in src/sas/sasgui/perspectives/fitting/pagestate.py [9a5097c:27109e5] in sasview

File:

• src/sas/sasgui/perspectives/fitting/pagestate.py (modified) (5 diffs)

src/sas/sasgui/perspectives/fitting/pagestate.py

@@ -18 +18 @@
 import copy
 import logging
-import numpy as np
+import numpy
 import traceback
 
@@ -410 +410 @@
         for fittable, name, value, _, uncert, lower, upper, units in params:
             if not value:
-                value = np.nan
+                value = numpy.nan
             if not uncert or uncert[1] == '' or uncert[1] == 'None':
                 uncert[0] = False
-                uncert[1] = np.nan
+                uncert[1] = numpy.nan
             if not upper or upper[1] == '' or upper[1] == 'None':
                 upper[0] = False
-                upper[1] = np.nan
+                upper[1] = numpy.nan
             if not lower or lower[1] == '' or lower[1] == 'None':
                 lower[0] = False
-                lower[1] = np.nan
+                lower[1] = numpy.nan
             if is_string:
                 p[name] = str(value)
@@ -449 +449 @@
                 lower = params.get(name + ".lower", '-inf')
                 units = params.get(name + ".units")
-                if std is not None and std is not np.nan:
+                if std is not None and std is not numpy.nan:
                     std = [True, str(std)]
                 else:
                     std = [False, '']
-                if lower is not None and lower is not np.nan:
+                if lower is not None and lower is not numpy.nan:
                     lower = [True, str(lower)]
                 else:
                     lower = [True, '-inf']
-                if upper is not None and upper is not np.nan:
+                if upper is not None and upper is not numpy.nan:
                     upper = [True, str(upper)]
                 else:
@@ -819 +819 @@
 
         attr = newdoc.createAttribute("version")
-        import sasview
+        from sas import sasview
         attr.nodeValue = sasview.__version__
         # attr.nodeValue = '1.0'
@@ -1100 +1100 @@
                                        % (line, tagname, name))
                                 logging.error(msg + traceback.format_exc())
-                        dic[name] = np.array(value_list)
+                        dic[name] = numpy.array(value_list)
                     setattr(self, varname, dic)