Changeset f7ef313 in sasview for fittingview/src/sans/perspectives/fitting/fitting.py

Timestamp:

Sep 8, 2011 3:26:53 PM (13 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:

36288ca

Parents:

5637362

Message:

allow computing the weight of series of data

File:

• fittingview/src/sans/perspectives/fitting/fitting.py (modified) (5 diffs)

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

@@ -432 +432 @@
         self.state_reader.write(filename=filepath, fitstate=fitstate)
 
-    def set_fit_weight(self, uid, weight, is2d=False, fid=None):
+    def set_fit_weight(self, uid, flag, is2d=False, fid=None):
         """
         Set the fit weights of a given page for all
@@ -442 +442 @@
         """
         if uid in self.page_finder.keys():
-            self.page_finder[uid].set_weight(weight=weight, is2d=is2d)
+            self.page_finder[uid].set_weight(flag=flag, is2d=is2d)
                     
     def set_fit_range(self, uid, qmin, qmax, fid=None):
@@ -698 +698 @@
                         name = str(element[1])
                         pars.append(name)
-
                     for fitproblem in  value.get_fit_problem():
                         if sim_fitter is None:
                             fitter = Fit(self._fit_engine)  
+                            print "onfit id ", id(fitproblem)
                             self._fit_helper(fitproblem, pars, fitter, fit_id)
                             fitter_list.append(fitter) 
@@ -793 +793 @@
         if data_list is None:
             data_list = []
+        
         self.page_finder[uid].set_fit_data(data=data_list)
         if caption is not None:
             self.page_finder[uid].set_fit_tab_caption(caption=caption)
-        
+            
     def on_add_new_page(self, event=None):
         """
@@ -848 +849 @@
                     self.parent.update_data(prev_data=theory_data,
                                              new_data=data)   
-              
         self.store_data(uid=page.uid, data_list=page.get_data_list(), 
                         caption=page.window_caption)