Changeset afab469 in sasview

Timestamp:

Mar 12, 2010 1:31:20 PM (15 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:

32e8c78

Parents:

edb30b66

Message:

Updated 2d data entry for test

Location:

DataLoader/test

Files:

• utest_abs_reader.py (modified) (2 diffs)
• utest_averaging.py (modified) (2 diffs)

DataLoader/test/utest_abs_reader.py

@@ -108 +108 @@
         
         self.assertEqual(self.data.detector[0].beam_center_unit, 'mm')
-        center_x = 68.76*5.0
-        center_y = 62.47*5.0
+        center_x = (68.76-1)*5.0
+        center_y = (62.47-1)*5.0
         self.assertEqual(self.data.detector[0].beam_center.x, center_x)
         self.assertEqual(self.data.detector[0].beam_center.y, center_y)
         
         self.assertEqual(self.data.I_unit, '1/cm')
-        self.assertEqual(self.data.data[0][0], 0.279783)
-        self.assertEqual(self.data.data[0][1], 0.28951)
-        self.assertEqual(self.data.data[0][2], 0.167634)
+        self.assertEqual(self.data.data[0], 0.279783)
+        self.assertEqual(self.data.data[1], 0.28951)
+        self.assertEqual(self.data.data[2], 0.167634)
         
 class danse_reader(unittest.TestCase):
@@ -147 +147 @@
         
         self.assertEqual(self.data.I_unit, '1/cm')
-        self.assertEqual(self.data.data[0][0], 1.57831)
-        self.assertEqual(self.data.data[0][1], 2.70983)
-        self.assertEqual(self.data.data[0][2], 3.83422)
-
-        self.assertEqual(self.data.err_data[0][0], 1.37607)
-        self.assertEqual(self.data.err_data[0][1], 1.77569)
-        self.assertEqual(self.data.err_data[0][2], 2.06313)
+        self.assertEqual(self.data.data[0], 1.57831)
+        self.assertEqual(self.data.data[1], 2.70983)
+        self.assertEqual(self.data.data[2], 3.83422)
+
+        self.assertEqual(self.data.err_data[0], 1.37607)
+        self.assertEqual(self.data.err_data[1], 1.77569)
+        self.assertEqual(self.data.err_data[2], 2.06313)
 
  

DataLoader/test/utest_averaging.py

@@ -3 +3 @@
 
 from DataLoader.loader import  Loader
-from DataLoader.manipulations import Ring, CircularAverage, SectorPhi, get_q
+from DataLoader.manipulations import Ring, CircularAverage, SectorPhi, get_q,reader2D_converter
  
 import os.path
@@ -20 +20 @@
         x_0  = numpy.ones([100,100])
         dx_0 = numpy.ones([100,100])
-        self.data = data_info.Data2D(x_0, dx_0)
+        
+        self.data = data_info.Data2D(data=x_0, err_data=dx_0)
         detector = data_info.Detector()
-        detector.distance = 1000.0
-        detector.pixel_size.x = 1.0
-        detector.pixel_size.y = 1.0
-        detector.beam_center.x = 50
-        detector.beam_center.y = 50
+        detector.distance = 1000.0  #mm
+        detector.pixel_size.x = 1.0 #mm
+        detector.pixel_size.y = 1.0 #mm
+        
+        # center in pixel position = (len(x_0)-1)/2
+        detector.beam_center.x = (len(x_0)-1)/2 #pixel number
+        detector.beam_center.y = (len(x_0)-1)/2 #pixel number
         self.data.detector.append(detector)
         
         source = data_info.Source()
-        source.wavelength = 10.0
+        source.wavelength = 10.0 #A
         self.data.source = source
         
-        self.qmin = get_q(1.0, 1.0, 1000.0, 10.0)
-        
+        # get_q(dx, dy, det_dist, wavelength) where units are mm,mm,mm,and A respectively.
+        self.qmin = get_q(1.0, 1.0, detector.distance, source.wavelength)
+
+        self.qmax = get_q(49.5, 49.5, detector.distance, source.wavelength)
+        
+        self.qstep = len(x_0)
+        x=  numpy.linspace(start= -1*self.qmax,
+                               stop= self.qmax,
+                               num= self.qstep,
+                               endpoint=True )  
+        y = numpy.linspace(start= -1*self.qmax,
+                               stop= self.qmax,
+                               num= self.qstep,
+                               endpoint=True )
+        self.data.x_bins=x
+        self.data.y_bins=y
+        self.data = reader2D_converter(self.data)
+            
     def test_ring_flat_distribution(self):
         """