Changeset 6d91073 in sasview for sansview/perspectives

Timestamp:

Nov 6, 2009 10:32:20 AM (15 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:

f9de20e

Parents:

7a77859

Message:

fixed dipspersion errors displaying wrong values

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (2 diffs)
• fitpage.py (modified) (7 diffs)
• fitting.py (modified) (5 diffs)

sansview/perspectives/fitting/basepage.py

@@ -113 +113 @@
         #wx.EVT_MENU(self, id, self.onRedo)       
         #self.popUpMenu.AppendSeparator()
-        if sys.platform.count("win32")>0:        
-            id = wx.NewId()
-            self._keep = wx.MenuItem(self.popUpMenu,id,"BookMark"," Keep the panel status to recall it later")
-            self.popUpMenu.AppendItem(self._keep)
-            self._keep.Enable(True)
-            wx.EVT_MENU(self, id, self.onSave)
-            self.popUpMenu.AppendSeparator()
-        
+        #if sys.platform.count("win32")>0:        
+        id = wx.NewId()
+        self._keep = wx.MenuItem(self.popUpMenu,id,"BookMark"," Keep the panel status to recall it later")
+        self.popUpMenu.AppendItem(self._keep)
+        self._keep.Enable(True)
+        wx.EVT_MENU(self, id, self.onSave)
+        self.popUpMenu.AppendSeparator()
+    
         ## Default locations
         self._default_save_location = os.getcwd()     
@@ -1581 +1581 @@
         self.sizer4.Layout()
         self.Layout()
-        self.Refresh()
-        self.SetScrollbars(20,20,25,65)       
+        #self.Refresh()
+        #self.SetScrollbars(20,20,25,65)       
           
         

sansview/perspectives/fitting/fitpage.py

@@ -82 +82 @@
         if event.type =="park":
             self.btFit.SetLabel("Fit")
-            
+
         for item in self.parameters:
             if event.type =="scipy" :
@@ -136 +136 @@
                     item[5].Show(True)
                     item[6].Show(True)
-     
-        self.SetScrollbars(20,20,25,65)
+        self.Layout()
+
         
     
@@ -835 +835 @@
             raise ValueError,"missing parameter to fit"    
       
-    def onsetValues(self,chisqr, out,cov):
+    def onsetValues(self,chisqr,p_name, out,cov):
         """
             Build the panel from the fit result
             @param chisqr:Value of the goodness of fit metric
+            @p_name: the name of parameters
             @param out:list of parameter with the best value found during fitting
             @param cov:Covariance matrix
@@ -859 +860 @@
         #set the panel when fit result are float not list
         if out.__class__== numpy.float64:
+            print "float64"
             self.param_toFit[0][2].SetValue(format_number(out))
             self.param_toFit[0][2].Refresh()
@@ -916 +918 @@
                         pass                   
                     for j in range(len(out)):
-                        if out[j]==self.model.getParam(item[1]):
-                            
+                        
+                        if item[1] == p_name[j]:
                             break
                         ## unable to compare cov[j]==numpy.nan so switch to None
                     #Save errors to model.details[item][3]
-                    self.model.details[item[1]][3] = cov[i]
-                                       
-                    
-                    if cov[i]==None or not numpy.isfinite(cov[i]):
+                    self.model.details[item[1]][3] = cov[j]
+                                                           
+                    if cov[j]==None or not numpy.isfinite(cov[j]):
 
                         if item[3].IsShown:
@@ -930 +931 @@
                         if item[4].IsShown:
                             item[4].Hide()           
-                        #k += 1
-    
+                        #k += 1   
 
                     else:
@@ -938 +938 @@
                         item[3].Refresh()
                         item[4].Show(True)
-                        item[4].SetValue(format_number(cov[i]))
+                        item[4].SetValue(format_number(cov[j]))
                         item[4].Refresh()
                     

sansview/perspectives/fitting/fitting.py

@@ -357 +357 @@
         if string.find(item,".")!=-1:
             param_names= re.split("\.",item)
-            model_name=param_names[0]
-            param_name=param_names[1]  
+            model_name=param_names[0]           
+            ##Assume max len is 3; eg., M0.radius.width
+            if len(param_names) == 3:
+                param_name=param_names[1]+"."+param_names[2]
+            else:
+                param_name=param_names[1]                    
             return model_name,param_name
         
@@ -755 +759 @@
                     model= value.get_model()
                     break
+            param_name = []
             i = 0
             for name in pars:
+                param_name.append(name)
                 if result.pvec.__class__==numpy.float64:
                     model.setParam(name,result.pvec)
@@ -763 +769 @@
                     i += 1
             ## Reset values of the current page to fit result
-            cpage.onsetValues(result.fitness, result.pvec,result.stderr)
+            cpage.onsetValues(result.fitness,param_name, result.pvec,result.stderr)
             ## plot the current model with new param
             metadata =  self.page_finder[cpage].get_fit_data()
@@ -804 +810 @@
                     model = value.get_model()
                     metadata =  value.get_plotted_data()
+                    small_param_name = []
                     small_out = []
                     small_cov = []
@@ -815 +822 @@
                                 small_out.append(p.value )
                                 model.setParam(param_name,p.value) 
-                              
+                                small_param_name.append(param_name)
                                 small_cov.append(p.stderr)
                             else:
                                 value= model.getParam(param_name)
                                 small_out.append(value )
+                                small_param_name.append(param_name)
                                 small_cov.append(None)
                     # Display result on each page 
-                    page.onsetValues(result.fitness, small_out,small_cov)
+                    page.onsetValues(result.fitness, small_param_name,small_out,small_cov)
                     #Replot models
                     msg= "Simultaneous Fit completed. plotting... %s:"%model.name