Changeset d15c0202 in sasview for sansview/perspectives/fitting/fitting.py

Timestamp:

Jan 13, 2009 5:52:02 PM (15 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:

e8d1066

Parents:

e4032d64

Message:

model page change on interface

File:

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

sansview/perspectives/fitting/fitting.py

@@ -611 +611 @@
                 qmax= 1.0
             if qstep ==None:
-                qstep =0.001
+                qstep =100
            
             #print "x in data1D",qmin,qmax
-            x = numpy.arange(qmin, qmax, qstep)        
+            #x = numpy.arange(qmin, qmax, qstep)  
+            x=  numpy.linspace(start= qmin,
+                               stop= qmax,
+                               num= qstep,
+                               endpoint=True
+                               )      
             xlen= len(x)
             y = numpy.zeros(xlen)
@@ -620 +625 @@
                 for i in range(xlen):
                     y[i] = model.run(x[i])
-        
+                
                 try:
                     new_plot = Theory1D(x, y)
@@ -635 +640 @@
                 for i in range(xlen):
                     y[i] = model.run(x[i])
-                    
+                #print x, y   
                 try:
                     new_plot = Theory1D(x, y)
@@ -655 +660 @@
         wx.PostEvent(self.parent, StatusEvent(status="Calc \
         complete in %g sec" % elapsed))
-                           
-        print "complete",output, model,qmin, qmax
+        #print "complete",output, model,qmin, qmax
         data = output
         theory= Data2D(data)
+        #print data.detector
+        #theory.detector= data.detector
+        from DataLoader.data_info import Detector, Source
+        
+        detector = Detector()
+        theory.detector=[]
+        theory.detector.append(detector)
+            
+        theory.detector[0].pixel_size.x= 5.0
+        theory.detector[0].pixel_size.y= 5.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.name= model.name
         theory.group_id ="Model"
         theory.id ="Model"
-        theory.xmin= qmin
+        theory.xmin= -qmax
         theory.xmax= qmax
-        theory.ymin= qmin
+        theory.ymin= -qmax
         theory.ymax= qmax
+        print "model draw comptele xmax",theory.xmax
         wx.PostEvent(self.parent, NewPlotEvent(plot=theory,
                          title="Analytical model 2D %s" %str(model.name)))
@@ -673 +694 @@
     def _draw_model2D(self,model,description=None, enable2D=False,qmin=None,qmax=None, qstep=None):
         if qmin==None:
-            qmin= -0.05
+            qmin= 0.0
         if qmax==None:
             qmax= 0.05
         if qstep ==None:
-            qstep =0.001
-        x = numpy.arange(qmin,qmax, qstep)
-        y = numpy.arange(qmin,qmax,qstep)
+            qstep =100
+       
+        x=  numpy.linspace(start= -1*qmax,
+                               stop= qmax,
+                               num= qstep,
+                               endpoint=True )  
+        y = numpy.linspace(start= -1*qmax,
+                               stop= qmax,
+                               num= qstep,
+                               endpoint=True )
+       
         lx = len(x)
         #print x
@@ -686 +715 @@
         if enable2D:
             from model_thread import Calc2D
-            self.calc_thread = Calc2D(parent =self.parent,x=x, y=y,model= self.model, qmin=qmin,qmax=qmax,
+            self.calc_thread = Calc2D(parent =self.parent,x=x,
+                                       y=y,model= self.model, 
+                                       qmin=qmin,
+                                       qmax=qmax,
                             completefn=self.complete,
                             updatefn=self.update)