Changeset 6d91073 in sasview for sansview/perspectives/fitting/fitting.py

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

File:

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

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