Changes in src/sas/sasgui/perspectives/pr/pr.py [c1d5aea:463e7ffc] in sasview

File:

• src/sas/sasgui/perspectives/pr/pr.py (modified) (16 diffs)

src/sas/sasgui/perspectives/pr/pr.py

@@ -21 +21 @@
 import time
 import math
-import numpy as np
+import numpy
 import pylab
 from sas.sasgui.guiframe.gui_manager import MDIFrame
@@ -209 +209 @@
         r = pylab.arange(0.01, d_max, d_max / 51.0)
         M = len(r)
-        y = np.zeros(M)
-        pr_err = np.zeros(M)
+        y = numpy.zeros(M)
+        pr_err = numpy.zeros(M)
 
         total = 0.0
@@ -255 +255 @@
         """
         # Show P(r)
-        y_true = np.zeros(len(x))
+        y_true = numpy.zeros(len(x))
 
         sum_true = 0.0
@@ -309 +309 @@
 
         x = pylab.arange(minq, maxq, maxq / 301.0)
-        y = np.zeros(len(x))
-        err = np.zeros(len(x))
+        y = numpy.zeros(len(x))
+        err = numpy.zeros(len(x))
         for i in range(len(x)):
             value = pr.iq(out, x[i])
@@ -339 +339 @@
         if pr.slit_width > 0 or pr.slit_height > 0:
             x = pylab.arange(minq, maxq, maxq / 301.0)
-            y = np.zeros(len(x))
-            err = np.zeros(len(x))
+            y = numpy.zeros(len(x))
+            err = numpy.zeros(len(x))
             for i in range(len(x)):
                 value = pr.iq_smeared(out, x[i])
@@ -384 +384 @@
         x = pylab.arange(0.0, pr.d_max, pr.d_max / self._pr_npts)
 
-        y = np.zeros(len(x))
-        dy = np.zeros(len(x))
-        y_true = np.zeros(len(x))
+        y = numpy.zeros(len(x))
+        dy = numpy.zeros(len(x))
+        y_true = numpy.zeros(len(x))
 
         total = 0.0
         pmax = 0.0
-        cov2 = np.ascontiguousarray(cov)
+        cov2 = numpy.ascontiguousarray(cov)
 
         for i in range(len(x)):
@@ -482 +482 @@
         """
         # Read the data from the data file
-        data_x = np.zeros(0)
-        data_y = np.zeros(0)
-        data_err = np.zeros(0)
+        data_x = numpy.zeros(0)
+        data_y = numpy.zeros(0)
+        data_err = numpy.zeros(0)
         scale = None
         min_err = 0.0
@@ -506 +506 @@
                         #err = 0
 
-                    data_x = np.append(data_x, x)
-                    data_y = np.append(data_y, y)
-                    data_err = np.append(data_err, err)
+                    data_x = numpy.append(data_x, x)
+                    data_y = numpy.append(data_y, y)
+                    data_err = numpy.append(data_err, err)
                 except:
                     logger.error(sys.exc_value)
@@ -530 +530 @@
         """
         # Read the data from the data file
-        data_x = np.zeros(0)
-        data_y = np.zeros(0)
-        data_err = np.zeros(0)
+        data_x = numpy.zeros(0)
+        data_y = numpy.zeros(0)
+        data_err = numpy.zeros(0)
         scale = None
         min_err = 0.0
@@ -557 +557 @@
                             #err = 0
 
-                        data_x = np.append(data_x, x)
-                        data_y = np.append(data_y, y)
-                        data_err = np.append(data_err, err)
+                        data_x = numpy.append(data_x, x)
+                        data_y = numpy.append(data_y, y)
+                        data_err = numpy.append(data_err, err)
                     except:
                         logger.error(sys.exc_value)
@@ -642 +642 @@
         # Now replot the original added data
         for plot in self._added_plots:
-            self._added_plots[plot].y = np.copy(self._default_Iq[plot])
+            self._added_plots[plot].y = numpy.copy(self._default_Iq[plot])
             wx.PostEvent(self.parent,
                          NewPlotEvent(plot=self._added_plots[plot],
@@ -666 +666 @@
         # Now scale the added plots too
         for plot in self._added_plots:
-            total = np.sum(self._added_plots[plot].y)
+            total = numpy.sum(self._added_plots[plot].y)
             npts = len(self._added_plots[plot].x)
             total *= self._added_plots[plot].x[npts - 1] / npts
@@ -816 +816 @@
         # Save Pr invertor
         self.pr = pr
-        cov = np.ascontiguousarray(cov)
+        cov = numpy.ascontiguousarray(cov)
 
         # Show result on control panel
@@ -984 +984 @@
         all_zeros = True
         if err == None:
-            err = np.zeros(len(pr.y))
+            err = numpy.zeros(len(pr.y))
         else:
             for i in range(len(err)):
@@ -1047 +1047 @@
         try:
             pr = self._create_file_pr(data)
-            if pr is not None:
+            if not pr is None:
                 self.pr = pr
                 self.perform_estimate()
@@ -1090 +1090 @@
         # If we have not errors, add statistical errors
         if y is not None:
-            if err == None or np.all(err) == 0:
-                err = np.zeros(len(y))
+            if err == None or numpy.all(err) == 0:
+                err = numpy.zeros(len(y))
                 scale = None
                 min_err = 0.0