Changeset dc317d1 in sasview

Timestamp:

Dec 17, 2008 4:29:39 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:

169460a

Parents:

cd84dca

Message:

working on model2D view

Location:

sansview/perspectives/fitting

Files:

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

sansview/perspectives/fitting/fitpage1D.py

@@ -482 +482 @@
         self.compute_chisqr()
         self.vbox.Layout()
+        self.Layout()
         self.GrandParent.GetSizer().Layout()
         

sansview/perspectives/fitting/fitting.py

@@ -4 +4 @@
 
 from copy import deepcopy 
-from danse.common.plottools.plottables import Data1D, Theory1D,Data2D,Theory2D
+from danse.common.plottools.plottables import Data1D, Theory1D,Data2D
 from danse.common.plottools.PlotPanel import PlotPanel
 from sans.guicomm.events import NewPlotEvent, StatusEvent  
@@ -94 +94 @@
                 return [["Select data  for Fitting",\
                           "Dialog with fitting parameters ", self._onSelect]] 
-            #elif item.__class__.__name__ is "Theory2D":
-            #     return [["Line Slicer [Q-view]","Sector Averaging as a function of Q",
-            #             self.onLineSlicer],
-            #             ["Annulus Slicer [Phi-view]","Sector Averaging as a function of Phi",
-            #             self.onLineSlicer]]
             else:
                 if item.name==graph.selected_plottable and\
@@ -532 +527 @@
                 
             else:
-                theory=Theory2D(data.data, data.err_data)
-                #theory=Theory2D(data.image, data.err_image)
+                theory=Data2D(data.data, data.err_data)
+                
                 theory.x_bins= data.x_bins
                 theory.y_bins= data.y_bins
@@ -635 +630 @@
                 except:
                     raise
-                
-                
-                
     def _draw_model2D(self,model,description=None, enable2D=False,qmin=None,qmax=None, qstep=None):
         if qmin==None:
@@ -647 +639 @@
         x = numpy.arange(qmin,qmax, qstep)
         y = numpy.arange(qmin,qmax,qstep)
-        
+        lx = len(x)
+        data=numpy.zeros([len(x),len(y)])
+        if enable2D:
+            """
+            for i_x in range(int(len(x)/2)):
+                if i_x%2==1:
+                    continue
+            for i_y in range(len(y)):
+                try:
+                    value = model.runXY([x[i_x], y[i_y]])
+                    #output[i_x][i_y] = value
+                    #output[lx-i_x-1][lx-i_y-1] = value
+                    data[i_y][i_x] = value
+                    data[lx-i_y-1][lx-i_x-1] = value
+                except:
+                     wx.PostEvent(self.parent, StatusEvent(status="\
+                        Error computing %s at [%g,%g] :%s" %(model.name,x[i_x],y[i_y], sys.exc_value)))
+                    
+            if lx%2==1:
+                i_x = int(len(x)/2)
+                for i_y in range(len(y)):
+                    try:
+                        value = model.runXY([x[i_x],y[i_y]])
+                        #output[i_x][i_y] = value
+                        data[i_y][i_x] = value
+                    except:
+                         wx.PostEvent(self.parent, StatusEvent(status="\
+                        Error computing %s at [%g,%g] :%s" %(model.name,x[i_x],y[i_y], sys.exc_value)))
+                       
+            """
+            for i_x in range(int(len(x)/2)):
+                """
+                if not i_x%2==1:
+                    continue
+                """
+                for i_y in range(len(y)):
+                    try:
+                        value = model.runXY([x[i_x],y[i_y]])
+                        #output[i_x][i_y] = value
+                        #output[lx-i_x-1][lx-i_y-1] = value
+                        data[i_y][i_x] = value
+                        data[lx-i_y-1][lx-i_x-1] = value
+                    except:
+                         wx.PostEvent(self.parent, StatusEvent(status="\
+                        Error computing %s at [%g,%g] :%s" %(model.name,x[i_x],y[i_y], sys.exc_value)))
+                       
+          
+
+            theory = (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 H_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)
+        lx = len(self.x)
         if enable2D:
             data=numpy.zeros([len(x),len(y)])
@@ -657 +716 @@
                          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 = Data2D(data)  
             theory.group_id =str(model.name)+" 2D"
             theory.xmin= qmin
@@ -664 +723 @@
             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

@@ -69 +69 @@
         self.btClose.Bind(wx.EVT_BUTTON, self.onClose,id=id)
         self.btClose.SetToolTipString("Close page.")
-        
-        ix = 12
-        iy = 1
+        ix = 0
+        iy = 1 
+        self.sizer4.Add(wx.StaticText(self, -1, 'Min'),(iy, ix),(1,1),\
+                            wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        ix += 2
+        self.sizer4.Add(wx.StaticText(self, -1, 'Max'),(iy, ix),(1,1),\
+                            wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        ix = 0
+        iy += 1
+        self.sizer4.Add(wx.StaticText(self, -1, 'x range'),(iy, ix),(1,1),\
+                            wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        try:
+            if hasattr(model,'x'):
+                qmin= numpy.min(model.x)
+            
+        except:
+            qmin= numpy.min(model.xmin)
+        ix += 1
+        self.xmin    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
+        #self.xmin.SetValue(format_number(numpy.min(model.x)))
+        self.xmin.SetToolTipString("Minimun value of x in linear scale.")
+        self.xmin.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
+        self.xmin.Bind(wx.EVT_TEXT_ENTER, self._onparamEnter)
+        self.sizer4.Add(self.xmin,(iy, ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        
+       
+        ix += 2
+        self.xmax    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
+        #self.xmax.SetValue(format_number(numpy.max(data.x)))
+        self.xmax.SetToolTipString("Maximum value of x in linear scale.")
+        self.xmax.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
+        self.xmax.Bind(wx.EVT_TEXT_ENTER, self._onparamEnter)
+       
+        self.sizer4.Add(self.xmax,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        ix = 0
+        iy += 1
+        self.sizer4.Add((20,20),(iy, ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        ix +=3
         self.sizer4.Add( self.btClose,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
         ix = 0
@@ -131 +166 @@
         """
         self.manager = manager
+        
     def onModel2D(self, event):
         
@@ -345 +381 @@
                             "Model Drawing  Error:wrong value entered : %s"% sys.exc_value))
             self.manager.draw_model(self.model,enable2D=self.model_view.GetValue())
-  
+            #self.manager.draw_model(self,model,description=None, enable1D=True,qmin=None,qmax=None, qstep=None)