Changeset 1852b17 in sasview

Timestamp:

Oct 11, 2018 7:08:17 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1249

Children:

e4e9162

Parents:

7c4bb4d

Message:

fix pylint relative import error on pr_inversion test (reprise)

File:

• test/pr_inversion/test/utest_explorer.py (modified) (2 diffs)

test/pr_inversion/test/utest_explorer.py

@@ -8 +8 @@
 from sas.sascalc.pr.invertor import Invertor
 from sas.sascalc.pr.distance_explorer import DistExplorer
+
+try:
+    from utest_invertor import load
+except ImportError:
+    from .utest_invertor import load
 
 def find(filename):
@@ -36 +41 @@
         self.assertEqual(len(results.chi2), 25)
 
-
-# Note: duplicated from utest_invertor because the following failed:
-#from .utest_invertor import load
-def load(path = "sphere_60_q0_2.txt"):
-    import numpy as np
-    import math
-    import sys
-    # Read the data from the data file
-    data_x   = np.zeros(0)
-    data_y   = np.zeros(0)
-    data_err = np.zeros(0)
-    scale    = None
-    if path is not None:
-        input_f = open(path,'r')
-        buff    = input_f.read()
-        lines   = buff.split('\n')
-        for line in lines:
-            try:
-                toks = line.split()
-                x = float(toks[0])
-                y = float(toks[1])
-                if len(toks)>2:
-                    err = float(toks[2])
-                else:
-                    if scale==None:
-                        scale = 0.15*math.sqrt(y)
-                    err = scale*math.sqrt(y)
-                data_x = np.append(data_x, x)
-                data_y = np.append(data_y, y)
-                data_err = np.append(data_err, err)
-            except:
-                pass
-
-    return data_x, data_y, data_err
-        
 if __name__ == '__main__':
     unittest.main()