Changeset 13e120a in sasview for sansview/perspectives/fitting

Timestamp:

Feb 9, 2009 3:22:03 PM (16 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

d0eac66

Parents:

fd25fb0

Message:

adding x_bins and y_bins to model after plotting

File:

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

sansview/perspectives/fitting/fitting.py

@@ -767 +767 @@
         #print "complete",output, model,qmin, qmax
         data = output
-        theory= Data2D(data)
-        #print data.detector
-        #theory.detector= data.detector
+        temp= numpy.zeros(numpy.shape(data))
+        temp[temp==0]=1
+        theory= Data2D(image=data, err_image=temp)
+    
         from DataLoader.data_info import Detector, Source
         
@@ -783 +784 @@
         theory.source= Source()
         theory.source.wavelength= 2*math.pi/1e+12#8.4
-        
+        theory.x_bins =[]
+        theory.y_bins =[]
+        # compute x_bins and y_bins
+        # Qx and Qy vectors
+    
+        distance   = theory.detector[0].distance
+        pixel      = qstep/2-1
+        theta      = pixel / distance / 100.0
+        wavelength = theory.source.wavelength
+        pixel_width_x = theory.detector[0].pixel_size.x
+        pixel_width_y = theory.detector[0].pixel_size.y
+        center_x      = theory.detector[0].beam_center.x/pixel_width_x
+        center_y      = theory.detector[0].beam_center.y/pixel_width_y
+        
+        
+        size_x, size_y= numpy.shape(theory.data)
+        #print "size_x,size_y",size_x, size_y
+        for i_x in range(size_x):
+            theta = (i_x-center_x+1)*pixel_width_x / distance / size_x#100.0
+            qx = 4.0*math.pi/wavelength * math.sin(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 = 4.0*math.pi/wavelength * math.sin(theta/2.0)
+            theory.y_bins.append(qy)
+           
+        #theory.err_data= numpy.    
         theory.name= model.name
         theory.group_id ="Model"