Changeset b2c6d23 in sasview for sansview/perspectives

Timestamp:

Jan 21, 2009 2:02:37 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:

2fa4655

Parents:

fbd0bece

Message:

Fake instrumental header information (Model 2D) is replaced in order for 2D model data to be equivalent to the real data.

File:

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

sansview/perspectives/fitting/fitting.py

@@ -710 +710 @@
         pass
     
-    def complete(self, output, elapsed, model, qmin, qmax):
+    def complete(self, output, elapsed, model, qmin, qmax,qstep=DEFAULT_NPTS):
        
         wx.PostEvent(self.parent, StatusEvent(status="Calc \
@@ -725 +725 @@
         theory.detector.append(detector)
             
-        theory.detector[0].pixel_size.x= 5.0
-        theory.detector[0].pixel_size.y= 5.0
+        theory.detector[0].pixel_size.x= qmax/(qstep/2-1)#5.0
+        theory.detector[0].pixel_size.y= qmax/(qstep/2-1)#5.0
+        theory.detector[0].beam_center.x= qmax
+        theory.detector[0].beam_center.y= qmax
+        theory.detector[0].distance= 1e+12#13705.0
         theory.source= Source()
-        theory.source.wavelength= 8.4
-        theory.detector[0].beam_center.x= 0
-        theory.detector[0].beam_center.y= 0
-        theory.detector[0].distance= 13705.0
+        theory.source.wavelength= 2*math.pi/1e+12#8.4
         
         theory.name= model.name
@@ -740 +740 @@
         theory.ymin= -qmax
         theory.ymax= qmax
+        
         print "model draw comptele xmax",theory.xmax
         wx.PostEvent(self.parent, NewPlotEvent(plot=theory,
@@ -768 +769 @@
                                        qmin=qmin,
                                        qmax=qmax,
+                                       qstep=qstep,
                             completefn=self.complete,
                             updatefn=None)