Changeset 53fc5ad9 in sasview

Timestamp:

Oct 13, 2011 4:00:42 PM (13 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:

3576dd0

Parents:

7124300

Message:

fixed simul fit page constraint sizer bug and raise error in park_fit

Files:

• fittingview/src/sans/perspectives/fitting/simfitpage.py (modified) (12 diffs)
• park_integration/src/sans/fit/ParkFitting.py (modified) (1 diff)

fittingview/src/sans/perspectives/fitting/simfitpage.py

@@ -69 +69 @@
         ## number of constraint
         self.nb_constraint= 0
+        self.model_cbox_left = None
+        self.model_cbox_right = None
         self.uid = wx.NewId()
         ## draw page
@@ -187 +189 @@
             self._store_model()
             ## display constraint fields
-            if self.show_constraint.GetValue():
+            if self.show_constraint.GetValue() and\
+                             len(self.constraints_list)==0:
                 self._show_all_constraint() 
                 self._show_constraint()
-                return
         else:
             for item in self.model_list:
@@ -198 +200 @@
             ##constraint info
             self._hide_constraint()
+            
+        self._update_easy_setup_cb()
         
     def check_model_name(self,event):
@@ -204 +208 @@
         """
         self.model_toFit=[]
+        cbox = event.GetEventObject()
         for item in self.model_list:
             if item[0].GetValue()==True:
@@ -213 +218 @@
         
         ## display constraint fields
-        if len(self.model_toFit)==1:
+        if len(self.model_toFit)>=1:
             self._store_model()
             if self.show_constraint.GetValue() and\
@@ -219 +224 @@
                 self._show_all_constraint() 
                 self._show_constraint()
+
         elif len(self.model_toFit)< 1:
             ##constraint info
-            self._hide_constraint()              
-       
+            self._hide_constraint()  
+                        
+        self._update_easy_setup_cb()
         ## set the value of the main check button          
         if len(self.model_list)==len(self.model_toFit):
@@ -229 +236 @@
         else:
             self.cb1.SetValue(False)
+            
+    def _update_easy_setup_cb(self):   
+        """
+        Update easy setup combobox on selecting a model
+        """
+        if self.model_cbox_left != None and self.model_cbox_right != None:
+            self.model_cbox_left.Clear()
+            self.model_cbox_right.Clear()
+            #for id, model in self.constraint_dict.iteritems():
+            for item in self.model_toFit:
+                model = item[3]
+                ## check if all parameters have been selected for constraint
+                ## then do not allow add constraint on parameters
+                if str(model.name) not in self.model_cbox_left.GetItems():
+                    self.model_cbox_left.Append(str(model.name), model)
+                if str(model.name) not in self.model_cbox_right.GetItems():
+                    self.model_cbox_right.Append(str(model.name), model)
+            self.model_cbox_left.SetSelection(0)
+            self.sizer2.Layout()
+            self.sizer3.Layout()
         
     def draw_page(self):      
@@ -522 +549 @@
             self.btAdd.Hide()
         self._store_model()
+        if self.model_cbox_left != None:
+            self.model_cbox_left.Clear()
+            self.model_cbox_left = None
+        if self.model_cbox_right != None:
+            self.model_cbox_right.Clear()
+            self.model_cbox_right = None
         self.constraints_list = []   
         self.sizer_all_constraints.Clear(True) 
@@ -535 +568 @@
         fill combox box with list of parameters
         """
+        param_list = []
         ##This way PC/MAC both work, instead of using event.GetClientData().
         n = self.model_cbox.GetCurrentSelection()
@@ -541 +575 @@
             if model == dic_model:
                 param_list = self.page_finder[id].get_param2fit()
-                break
+                #break
         #param_list= get_fittableParam(model)
         length = len(self.constraints_list)
@@ -551 +585 @@
         for param in param_list:
             param_cbox.Append( str(param), model)
-            
+
         param_cbox.Show(True)
         self.btRemove.Show(True)
@@ -770 +804 @@
                             wx.EXPAND|wx.ADJUST_MINSIZE, 0) 
         for id, value in self.page_finder.iteritems():
+            if id not in self.parent.opened_pages:
+                continue
             try:
                 ix = 0

park_integration/src/sans/fit/ParkFitting.py

@@ -121 +121 @@
         This procedure maps a local optimizer across a set of initial points.
         """
-        park.fitmc.fitmc(objective, x0, bounds, self.localfit,
-              self.start_points, self.handler)
-
+        try:
+            park.fitmc.fitmc(objective, x0, bounds, self.localfit,
+                             self.start_points, self.handler)
+        except:
+            raise ValueError, "Fit did not converge.\n"
         
 class SansPart(Part):