Changeset 72538fc in sasview

Timestamp:

Jun 14, 2012 12:50:07 PM (12 years ago)

Author:

Jae Cho <jhjcho@…>

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:

0008f54

Parents:

dcf73a4

Message:

unlock some test and fixed calling the data

File:

• sansdataloader/test/utest_manipulations.py (modified) (7 diffs)

sansdataloader/test/utest_manipulations.py

@@ -7 +7 @@
 import numpy, math
 from sans.dataloader.loader import  Loader
-from sans.dataloader.data_info import Data1D, Data2D
+from sans.guiframe.dataFitting import Data1D, Data2D
  
 import os.path
@@ -141 +141 @@
         dqy_0 = numpy.arange(25)/100
         q_0 = numpy.sqrt(qx_0 * qx_0 + qy_0 * qy_0)
-        self.data = Data2D(x_0, dx_0, qx_0, qy_0, q_0, mask_0, dqx_0, dqy_0)
+        self.data = Data2D(image=x_0, err_image=dx_0, qx_data=qx_0, 
+                           qy_data=qy_0, q_data=q_0, mask=mask_0, 
+                           dqx_data=dqx_0, dqy_data=dqy_0)
         
         y = numpy.ones(25)
@@ -149 +151 @@
         mask = numpy.zeros(25)
         q = numpy.sqrt(qx * qx + qy * qy)
-        self.data2 = Data2D(y, dy, qx, qy, q, mask)
+        self.data2 = Data2D(image=y, err_image=dy, qx_data=qx, qy_data=qy, 
+                            q_data=q, mask=mask)
         
         
@@ -195 +198 @@
             self.assertEqual(result.data[i], 5.0)
             self.assertEqual(result.err_data[i], 0.5)
-        #Currently NOT supported    
-        #result = 3.0+self.data
-        #for i in range(25):
-        #    self.assertEqual(result.data[i], 5.0)
-        #    self.assertEqual(result.err_data[i], 0.5)
+   
+        result = 3.0+self.data
+        for i in range(25):
+            self.assertEqual(result.data[i], 5.0)
+            self.assertEqual(result.err_data[i], 0.5)
             
     def test_rsub(self):
@@ -206 +209 @@
             self.assertEqual(result.data[i], -1.0)
             self.assertEqual(result.err_data[i], 0.5)
-        #Currently NOT supported     
-        #result = 3.0-self.data
-        #for i in range(25):
-        #    self.assertEqual(result.data[i], 1.0)
-        #    self.assertEqual(result.err_data[i], 0.5)
+    
+        result = 3.0-self.data
+        for i in range(25):
+            self.assertEqual(result.data[i], 1.0)
+            self.assertEqual(result.err_data[i], 0.5)
             
     def test_rmul(self):
@@ -217 +220 @@
             self.assertEqual(result.data[i], 6.0)
             self.assertEqual(result.err_data[i], 1.5)
-        #Currently NOT supported     
-        #result = 3.0*self.data
-        #for i in range(25):
-        #    self.assertEqual(result.data[i], 6.0)
-        #    self.assertEqual(result.err_data[i], 1.5)
+ 
+        result = 3.0*self.data
+        for i in range(25):
+            self.assertEqual(result.data[i], 6.0)
+            self.assertEqual(result.err_data[i], 1.5)
             
     def test_rdiv(self):
@@ -228 +231 @@
             self.assertEqual(result.data[i], 0.5)
             self.assertEqual(result.err_data[i], 0.125)
-        #Currently NOT supported 
-        #result = 6.0/self.data
-        #for i in range(25):
-        #    self.assertEqual(result.data[i], 3.0)
-        #    self.assertEqual(result.err_data[i], 6.0*0.5/4.0)
+
+        result = 6.0/self.data
+        for i in range(25):
+            self.assertEqual(result.data[i], 3.0)
+            self.assertEqual(result.err_data[i], 6.0*0.5/4.0)