Changeset e9e914f in sasview

Timestamp:

Feb 27, 2009 9:18:12 AM (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:

7d680c7

Parents:

f3113c9

Message:

remove small changes

Location:

sansview/perspectives/fitting

Files:

• fitting.py (modified) (4 diffs)
• modelpage.py (modified) (4 diffs)

sansview/perspectives/fitting/fitting.py

@@ -47 +47 @@
         self.standalone=True
         ## Fit engine
-        self._fit_engine = 'park'
+        self._fit_engine = 'scipy'
         self.enable_model2D=False
         # list of selcted data
@@ -76 +76 @@
         #Set park engine
         id3 = wx.NewId()
-        self.menu1.AppendCheckItem(id3, "scipy") 
+        self.menu1.AppendCheckItem(id3, "park") 
         wx.EVT_MENU(owner, id3, self._onset_engine)
         
@@ -360 +360 @@
                     model.setParam(name,result.pvec)
                 else:
-                    model.setParam(name,result.pvec[i])
-#                    print "fitting: single fit", name, result.pvec[i]
+                    print "fitting result : chisqr",result.fitness
+                    print "fitting result : pvec",result.pvec
+                    print "fitting result : stderr",result.stderr
+                    #model.setParam(name,result.pvec[i])
+#                   print "fitting: single fit", name, result.pvec[i]
                     i += 1
-            print "fitting result : chisqr",result.fitness
-            print "fitting result : pvec",result.pvec
-            print "fitting result : stderr",result.stderr
+           
            
             cpage.onsetValues(result.fitness, result.pvec,result.stderr)
@@ -373 +374 @@
                              xmin=xmin, xmax=xmax,title=None)
         except:
-            #raise
-            wx.PostEvent(self.parent, StatusEvent(status="Fitting error: %s" % sys.exc_value))
-            return
+            raise
+            #wx.PostEvent(self.parent, StatusEvent(status="Fitting error: %s" % sys.exc_value))
+            #return
        
     def _simul_fit_completed(self,result,qmin,qmax, elapsed,pars=None,cpage=None,

sansview/perspectives/fitting/modelpage.py

@@ -540 +540 @@
         self.text2_3.Hide() 
         
-        ix +=1
-        self.text2_5 = wx.StaticText(self, -1, 'Min')
-        self.sizer5.Add(self.text2_5,(iy, ix),(1,1),\
-                            wx.EXPAND|wx.ADJUST_MINSIZE, 0) 
-        ix +=1
-        self.text2_6 = wx.StaticText(self, -1, 'Max')
-        self.sizer5.Add(self.text2_6,(iy, ix),(1,1),\
-                            wx.EXPAND|wx.ADJUST_MINSIZE, 0) 
-        if self.data ==None:
-            self.text2_5.Hide()
-            self.text2_6.Hide()
+       
         ix +=1
         self.text2_4 = wx.StaticText(self, -1, 'Units')
@@ -587 +577 @@
                 self.sizer5.Add(ctl2, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
                 ctl2.Hide()
-                ix += 1
-                param_min= format_number(self.model.details[item][1])
-                ctl3 = wx.TextCtrl(self, -1, size=(_BOX_WIDTH/2,20), style=wx.TE_PROCESS_ENTER)
-                if float(param_min) ==0:
-                    ctl3.SetValue("-inf")
-                else:
-                    ctl3.SetValue(str (format_number(param_min)))
-                ctl3.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
-                ctl3.Bind(wx.EVT_TEXT_ENTER,self._onparamEnter)
-                
-                self.sizer5.Add(ctl3, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-                ix += 1
-                param_max= format_number(self.model.details[item][2])
-                ctl4 = wx.TextCtrl(self, -1, size=(_BOX_WIDTH/2,20), style=wx.TE_PROCESS_ENTER)
-                if float(param_max)==0:
-                    ctl4.SetValue("+inf")
-                else:
-                    ctl4.SetValue(str (format_number(param_max)))
-                ctl4.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
-                ctl4.Bind(wx.EVT_TEXT_ENTER,self._onparamEnter)
-                self.sizer5.Add(ctl4, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-                if self.data==None:
-                    ctl4.Hide()
-                    ctl3.Hide()
+               
                 ix +=1
                 # Units
@@ -619 +586 @@
                 self.sizer5.Add(units, (iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
            
-            self.parameters.append([cb,ctl1,text2,ctl2, ctl3, ctl4])
+            self.parameters.append([cb,ctl1,text2,ctl2])
                 
         iy+=1
@@ -1111 +1078 @@
                 for item in self.parameters:
                     item[0].SetValue(True)
-                    list= [item[0],item[1],item[2],item[3],item[4],item[5]]
+                    list= [item[0],item[1],item[2],item[3]]
                     self.param_toFit.append(list )
                 if len(self.fittable_param)>0: