Changeset d250f7d in sasview

Timestamp:

Dec 15, 2008 7:06:42 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:

e8c96f5

Parents:

e5a9e32

Message:

model 2D changed

Location:

sansview/perspectives/fitting

Files:

• fitting.py (modified) (3 diffs)
• modelpage.py (modified) (1 diff)

sansview/perspectives/fitting/fitting.py

@@ -14 +14 @@
 import fitpage1D,fitpage2D
 import park
-
+DEFAULT_BEAM = 0.005
 class Plugin:
     """
@@ -581 +581 @@
         self.draw_model(model,self.enable_model2D)
         
-    def draw_model(self,model,description=None, enable2D=False,qmin=None, qmax=None):
+    def draw_model(self,model,description=None,enable1D=True, enable2D=False,qmin=None, qmax=None,qstep=None):
         """
              draw model with default data value
         """
         self.fit_panel.add_model_page(model,model.description,model.name) 
-        #x = numpy.arange(0.001, 1.0, 0.001)
-        #y = numpy.arange(0.001, 1.0, 0.001)
-        x = numpy.arange(-0.05, 0.05, 0.001)
-        y = numpy.arange(-0.05, 0.05, 0.001)
-        
-        print "went here ",len(x)
-        if enable2D:
-            data=numpy.zeros([len(x),len(y)])
-            for i in range(len(y)):
-                for j in range(len(x)):
-                    if i >=0 and i<=0.005 or j >=0 and j<=0.005:
-                        data[i][j]=0
-                    else:
-                        data[i][j]=model.runXY([j,i])
-            theory = Theory2D(data)  
-            theory.group_id =str(model.name)+" 2D"
-            theory.xmin=-0.05
-            theory.xmax= 0.05
-            theory.ymin= -0.05
-            theory.ymax= 0.05
-            wx.PostEvent(self.parent, NewPlotEvent(plot=theory, title="Analytical model 2D"))
-        else:
-            x = numpy.arange(0.001, 1.0, 0.001)        
+        self._draw_model2D(model,model.description, enable2D,qmin,qmax,qstep)
+        self._draw_model1D(model,model.description, enable1D,qmin,qmax, qstep)
+       
+    def _draw_model1D(self,model,description=None, enable1D=True,qmin=None,qmax=None, qstep=None):
+        
+        if enable1D:
+            if qmin==None:
+                qmin= 0.001
+            if qmax==None:
+                qmax= 1.0
+            if qstep ==None:
+                qstep =0.001
+           
+            
+            x = numpy.arange(qmin, qmax, qstep)        
             xlen= len(x)
             y = numpy.zeros(xlen)
-            if not enable2D:
+            if not enable1D:
                 for i in range(xlen):
                     y[i] = model.run(x[i])
@@ -643 +635 @@
                 except:
                     raise
+                
+                
+                
+    def _draw_model2D(self,model,description=None, enable2D=False,qmin=None,qmax=None, qstep=None):
+        if qmin==None:
+            qmin= -0.05
+        if qmax==None:
+            qmax= 0.05
+        if qstep ==None:
+            qstep =0.001
+        x = numpy.arange(qmin,qmax, qstep)
+        y = numpy.arange(qmin,qmax,qstep)
+        
+        if enable2D:
+            data=numpy.zeros([len(x),len(y)])
+            for i in range(len(x)):
+                for j in range(len(x)):
+                    try:
+                        data[i][j]=model.runXY([j,i])
+                    except:
+                         wx.PostEvent(self.parent, StatusEvent(status="\
+                        Model 2D cannot be plot %g %s %s" %(data[i][j],model.name, sys.exc_value)))
+            theory = Theory2D(data)  
+            theory.group_id =str(model.name)+" 2D"
+            theory.xmin= qmin
+            theory.xmax= qmax
+            theory.ymin= qmin
+            theory.ymax= qmax
+            wx.PostEvent(self.parent, NewPlotEvent(plot=theory, title="Analytical model 2D"))
     def on_draw_model2D(self, event):
         """

sansview/perspectives/fitting/modelpage.py

@@ -344 +344 @@
                      wx.PostEvent(self.parent.GrandParent, StatusEvent(status=\
                             "Model Drawing  Error:wrong value entered : %s"% sys.exc_value))
-            self.manager.draw_model(self.model)
+            self.manager.draw_model(self.model,enable2D=self.model_view.GetValue())