Changeset e9e914f in sasview for sansview/perspectives/fitting/fitting.py

Timestamp:

Feb 27, 2009 11: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

File:

• sansview/perspectives/fitting/fitting.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,