Changeset 3a473ef in sasview for test/corfunc/test/utest_corfunc.py

Timestamp:

Aug 31, 2018 5:13:23 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

c1cfa80

Parents:

aa1db44

Message:

Manual update of test/ directory with changes on master - SASVIEW-996

File:

• test/corfunc/test/utest_corfunc.py (modified) (5 diffs)

test/corfunc/test/utest_corfunc.py

@@ -4 +4 @@
 from __future__ import division, print_function
 
+import os.path
 import unittest
 import time
@@ -11 +12 @@
 from sas.sascalc.corfunc.corfunc_calculator import CorfuncCalculator
 from sas.sascalc.dataloader.data_info import Data1D
+
+
+def find(filename):
+    return os.path.join(os.path.dirname(__file__), filename)
 
 
@@ -31 +36 @@
         self.extrapolation = None
         self.transformation = None
-        self.results = [np.loadtxt(filename+"_out.txt").T[2]
+        self.results = [np.loadtxt(find(filename+"_out.txt")).T[2]
                         for filename in ("gamma1", "gamma3", "idf")]
 
@@ -69 +74 @@
         while True:
             time.sleep(0.001)
-            if not self.calculator.transform_isrunning():
+            if (not self.calculator.transform_isrunning() and
+                self.transformation is not None):
                 break
 
-    def transform_callback(self, transforms):
-        transform1, transform3, idf = transforms
+        transform1, transform3, idf = self.transformation
         self.assertIsNotNone(transform1)
         self.assertAlmostEqual(transform1.y[0], 1)
         self.assertAlmostEqual(transform1.y[-1], 0, 5)
+
+    def transform_callback(self, transforms):
         self.transformation = transforms
 
@@ -110 +117 @@
 
 def load_data(filename="98929.txt"):
-    data = np.loadtxt(filename, dtype=np.float64)
+    data = np.loadtxt(find(filename), dtype=np.float64)
     q = data[:,0]
     iq = data[:,1]