Changeset ac2cc940 in sasview

Timestamp:

Feb 15, 2009 4:57:49 PM (16 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:

39c8c4e

Parents:

3896ddc

Message:

2d fit plot on 2d model data is all fixed

File:

• sansview/perspectives/fitting/fitting.py (modified) (2 diffs)

sansview/perspectives/fitting/fitting.py

@@ -805 +805 @@
         theory.detector.append(detector) 
             
-        theory.detector[0].pixel_size.x= qmax/(qstep/2+0.5)#5.0
-        theory.detector[0].pixel_size.y= qmax/(qstep/2+0.5)#5.0
+        theory.detector[0].distance=1e+32#13705.0
+        theory.source= Source()
+        theory.source.wavelength=2*math.pi/1e+32#8.4
+        theory.x_bins =[]
+        theory.y_bins =[]
+        #Now qmax is xmax.
+        xmax=2*theory.detector[0].distance*math.atan(qmax/(4*math.pi/theory.source.wavelength))
+        theory.detector[0].pixel_size.x= xmax/(qstep/2-0.5)#5.0
+        theory.detector[0].pixel_size.y= xmax/(qstep/2-0.5)#5.0
         theory.detector[0].beam_center.x= qmax
         theory.detector[0].beam_center.y= qmax
-        theory.detector[0].distance=1e+56#13705.0
-        theory.source= Source()
-        theory.source.wavelength=2*math.pi/1e+56#8.4
-        theory.x_bins =[]
-        theory.y_bins =[]
+        #print "xmax,qmax",xmax,qmax
         # compute x_bins and y_bins
         # Qx and Qy vectors
@@ -828 +831 @@
         
         size_x, size_y= numpy.shape(theory.data)
-        print "size_x,size_y",size_x, size_y
+        #print "size_x,size_y",size_x, size_y
         #This case, q and x are equivalent to each other.
         for i_x in range(size_x):
-            theta = (i_x-center_x+1)*pixel_width_x / distance #/ size_x#100.0
-            qx = distance*theta#4.0*math.pi/wavelength * math.sin(theta/2.0)
+            theta = (i_x-center_x)*pixel_width_x / distance #/ size_x#100.0
+            qx = 4.0*math.pi/wavelength * math.tan(theta/2.0)
             theory.x_bins.append(qx)    
         for i_y in range(size_y):
-            theta = (i_y-center_y+1)*pixel_width_y / distance #/ size_y#100.0
-            qy =distance*theta#4.0*math.pi/wavelength * math.sin(theta/2.0)
+            theta = (i_y-center_y)*pixel_width_y / distance #/ size_y#100.0
+            qy =4.0*math.pi/wavelength * math.tan(theta/2.0)
             theory.y_bins.append(qy)