Changeset 97d69d9 in sasview

Timestamp:

Oct 25, 2009 10:00:24 AM (15 years ago)

Author:

Mathieu Doucet <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

4cabee7

Parents:

75d6342

Message:

pr_inversion: get rid of unnecessary imports

Location:

pr_inversion

Files:

• __init__.py (modified) (1 diff)
• invertor.py (modified) (3 diffs)
• num_term.py (modified) (1 diff)
• test/utest_invertor.py (modified) (3 diffs)

pr_inversion/__init__.py

@@ -39 +39 @@
 #
 # \subsection depends External Dependencies
-# scipy, numpy, pylab
+# scipy, numpy
 #
 # \subsection build Building the code

pr_inversion/invertor.py

@@ -7 +7 @@
 import sys
 import math, time
-from scipy.linalg.basic import lstsq
+from numpy.linalg import lstsq
 
 def help():
@@ -554 +554 @@
             @param npts: number of P(r) points to be written
         """
-        import pylab
-        
         file = open(path, 'w')
         file.write("#d_max=%g\n" % self.d_max)
@@ -577 +575 @@
                     file.write("#C_%i=%s+-%s\n" % (i, str(self.out[i]), str(self.cov[i][i])))
         file.write("<r>  <Pr>  <dPr>\n")
-        r = pylab.arange(0.0, self.d_max, self.d_max/npts)
+        r = numpy.arange(0.0, self.d_max, self.d_max/npts)
         
         for r_i in r:

pr_inversion/num_term.py

@@ -1 @@
-import unittest, math, numpy, pylab, sys, string
+import unittest, math, numpy, sys, string
 from sans.pr.invertor import Invertor
 

pr_inversion/test/utest_invertor.py

@@ -8 +8 @@
 
 
-import unittest, math, numpy, pylab
+import unittest, math, numpy
 from sans.pr.invertor import Invertor
         
@@ -206 +206 @@
         # Check the computed P(r) with the theory
         # for shpere of radius 80
-        x = pylab.arange(0.01, self.invertor.d_max, self.invertor.d_max/51.0)
+        x = numpy.arange(0.01, self.invertor.d_max, self.invertor.d_max/51.0)
         y = numpy.zeros(len(x))
         dy = numpy.zeros(len(x))
@@ -268 +268 @@
         # Check the computed P(r) with the theory
         # for shpere of radius 80
-        x = pylab.arange(0.01, self.invertor.d_max, self.invertor.d_max/51.0)
+        x = numpy.arange(0.01, self.invertor.d_max, self.invertor.d_max/51.0)
         y = numpy.zeros(len(x))
         dy = numpy.zeros(len(x))