Changeset 813334e in sasview

Timestamp:

Apr 23, 2009 3:39:33 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:

4bd557d

Parents:

e473e4f5

Message:

fix q range for fitpage

Location:

sansview/perspectives/fitting

Files:

• fitpage.py (modified) (3 diffs)
• fitting.py (modified) (2 diffs)
• model_thread.py (modified) (2 diffs)

sansview/perspectives/fitting/fitpage.py

@@ -45 +45 @@
         ## draw sizer
         self._fill_datainfo_sizer()
+        print "self.qmin, self.qmax====>",self.qmax_x,self.qmin_x
         self._fill_model_sizer( self.sizer1)
         self._fill_range_sizer() 
@@ -53 +54 @@
                 self.enable_smearer.Disable()
                 self.disable_smearer.Disable()
-        #try:
-            ##Calculate chi2
-        #    self.compute_chisqr(smearer= temp_smearer)  
-        #except:
-        #    raise              
+       
         ## to update the panel according to the fit engine type selected
         self.Bind(EVT_FITTER_TYPE,self._on_engine_change)
@@ -188 +185 @@
         if not hasattr(self.data,"data"): #Display only for 1D data fit
             # Minimum value of data   
-            #data_min = str(format_number(numpy.min(self.data.x)))
-            data_min = str((numpy.min(self.data.x)))
+            data_min = min(self.data.x)
             # Maximum value of data  
-#            data_max = str(format_number(numpy.max(self.data.x)))
-            data_max = str((numpy.max(self.data.x)))
+            data_max = max(self.data.x)
             text4_3 = wx.StaticText(self, -1, 'Total Q Range (1/A)',
                                      style=wx.ALIGN_LEFT)
             sizer_data.Add( text4_3 )
-            sizer_data.Add(wx.StaticText(self, -1, "Min : %s"%data_min))
-            
-            sizer_data.Add(wx.StaticText(self, -1, "Max : %s"%data_max))
+            sizer_data.Add(wx.StaticText(self, -1, "Min : %s"%str(data_min)))
+            sizer_data.Add(wx.StaticText(self, -1, "Max : %s"%str(data_max)))
             
         else:
-            radius_min= 0
-            x= numpy.max(self.data.xmin, self.data.xmax)
-            y= numpy.max(self.data.ymin, self.data.ymax)
-            radius_max = math.sqrt(x*x + y*y)
-            
+            ## Minimum value of data 
+            data_min= 0
+            x= max(math.fabs(self.data.xmin), math.fabs(self.data.xmax)) 
+            y= max(math.fabs(self.data.ymin), math.fabs(self.data.ymax))
+            ## Maximum value of data  
+            data_max = math.sqrt(x*x + y*y)
+          
             #For qmin and qmax, do not use format_number
             #.(If do, qmin and max could be different from what is in the data.)
-            # Minimum value of data   
-            data_min = str((radius_min))
-            # Maximum value of data  
-            data_max = str((radius_max))
             text4_3 = wx.StaticText(self, -1, "Total Q Range (1/A)",
                                      style=wx.ALIGN_LEFT)
             sizer_data.Add( text4_3 )
-            sizer_data.Add(wx.StaticText(self, -1, "Min : %s"%data_min))
-            sizer_data.Add(wx.StaticText(self, -1, "Max : %s"%data_max))
-            
+            sizer_data.Add(wx.StaticText(self, -1, "Min : %s"%str(data_min)))
+            sizer_data.Add(wx.StaticText(self, -1, "Max : %s"%str(data_max)))
+        ## set q range to plot
+        self.qmin_x= data_min
+        self.qmax_x= data_max
+
         boxsizer1.Add(sizer_data)
         #------------------------------------------------------------
         self.sizer0.Add(boxsizer1,0, wx.EXPAND | wx.ALL, 10)
         self.sizer0.Layout()
-        
-        self.qmin_x= data_min
-        self.qmax_x= data_max
+       
         
        

sansview/perspectives/fitting/fitting.py

@@ -635 +635 @@
                     item.is_data=True
                     data.is_data=True
+                
             ## create anew page                   
             if item.name == self.panel.graph.selected_plottable or\
@@ -649 +650 @@
                         self.page_finder[page].add_plotted_data(item)
                         self.page_finder[page].add_fit_data(data)
-                        
+
                         wx.PostEvent(self.parent, StatusEvent(status="Page Created"))
                     else:

sansview/perspectives/fitting/model_thread.py

@@ -106 +106 @@
             Compute the data given a model function
         """
-        x = self.x
-        y = self.y
-        output = numpy.zeros((len(x),len(y)))
+     
+        output = numpy.zeros((len(self.x),len(self.y)))
         if self.qmin==None:
             self.qmin = 0
@@ -116 +115 @@
                 newy= math.pow(max(math.fabs(self.data.ymax),math.fabs(self.data.ymin)),2)
                 self.qmax=math.sqrt( newx + newy )
-            else:
-                self.qmax= max(self.x)
-        
+      
+       
         self.starttime = time.time()
         lx = len(self.x)