Changeset dabb633 in sasview for sansview

Timestamp:

Sep 17, 2008 9:08:04 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:

671d14e1

Parents:

fadea71

Message:

comments added

File:

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

sansview/perspectives/fitting/fitting.py

@@ -13 +13 @@
 import models
 import fitpage
+import park
 
 class PlottableData(Data,Data1D):
@@ -32 +33 @@
 class Plugin:
     """
+        Fitting plugin is used to perform fit 
     """
     def __init__(self):
@@ -169 +171 @@
                     self.page_finder[page].add_data(datap)
                 except:
-                    raise 
                     wx.PostEvent(self.parent, StatusEvent(status="Fitting error: \
                     data already Selected "))
@@ -194 +195 @@
                 if model.name== modelname:
                     value.set_model_param(names,values)
-                    
                     break
 
@@ -252 +252 @@
         try:
             for page, value in self.page_finder.iteritems():
-                print "fitting : simultaneous scheduled ",value.get_scheduled()
                 if value.get_scheduled()=='True':
                     data = value.get_data()
@@ -306 +305 @@
                     templist=current_pg.get_param_list()
                 except:
-                    raise
                     wx.PostEvent(self.parent, StatusEvent(status="Fitting error: %s" % sys.exc_value))
                     return
@@ -351 +349 @@
         for page, value in self.page_finder.iteritems():
             try:
-                print "fitting : simultaneous scheduled ",value.get_scheduled(),value.schedule
                 if value.get_scheduled()=='True':
-                    print "fitting: self.page_finder",value.get_scheduled()
                     data = value.get_data()
-                    #print "fitting: data",data
                     list = value.get_model()
                     model= list[0]
@@ -376 +371 @@
                 wx.PostEvent(self.parent, StatusEvent(status="Fitting error: %s" % sys.exc_value))
                 return 
-            #Do the simultaneous fit
+        #Do the simultaneous fit
         try:
             result=self.fitter.fit()
@@ -392 +387 @@
             self._on_change_engine('park')
         wx.PostEvent(self.parent, StatusEvent(status="Engine set to: %s" % self._fit_engine))
-    
   
     
@@ -423 +417 @@
             self.index_model += 1  
             self.page_finder[current_pg].set_theory("Fitness")
-            #print "on model",model.name
             self.page_finder[current_pg].set_model(model,M_name)
             self.plot_helper(currpage= current_pg,qmin= None,qmax= None)
@@ -451 +444 @@
                 if  page==currpage :  
                     break 
-           
             data=self.page_finder[page].get_data()
             list=self.page_finder[page].get_model()
@@ -501 +493 @@
                     wx.PostEvent(self.parent, NewPlotEvent(plot=theory, title="Analytical model"))
                 except:
-                    raise
                     print "SimView.complete1D: could not import sans.guicomm.events"