Changeset 8aa5788 in sasview

Timestamp:

Sep 12, 2011 10:50:36 AM (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:

7afcae8

Parents:

dc79cfc

Message:

allow compute smearer everything is needed

Location:

fittingview/src/sans/perspectives/fitting

Files:

• fit_thread.py (modified) (3 diffs)
• fitproblem.py (modified) (2 diffs)
• fitting.py (modified) (10 diffs)

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

@@ -20 +20 @@
                   page_id,
                    handler,
+                   batch_result, 
                   pars=None,
                  completefn = None,
@@ -33 +34 @@
         self.fitter = fn
         self.pars = pars
+        self.batch_result = batch_result
         self.page_id = page_id
         self.starttime = 0
@@ -75 +77 @@
             #self.handler.starting_fit()
             self.complete(result= result,
+                          batch_result=self.batch_result,
                           page_id=self.page_id,
                           pars = self.pars)

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

@@ -432 +432 @@
         if not self.smearer_enable:
             return None
-        if self.smearer_computer_value is None and \
-            self.smearer_compute_count > 1:
+        #if self.smearer_computer_value is None and \
+        #     self.smearer_compute_count > 1:
             #smeari_selection should be call only once per fitproblem
-            self.smearer_computer_value = smear_selection(self.fit_data,
+        self.smearer_computer_value = smear_selection(self.fit_data,
                                                            self.model)
-            self.smearer_compute_count += 1
+        self.smearer_compute_count += 1
         return self.smearer_computer_value
     
@@ -450 +450 @@
         return self.name_per_page
     
-    def set_model(self,model):
+    def set_model(self, model):
         """ 
         associates each model with its new created name

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

@@ -682 +682 @@
         list_page_id = []
         fit_id = 0
+        batch_result = {}
         for page_id, value in self.page_finder.iteritems():
             # For simulfit (uid give with None), do for-loop
@@ -701 +702 @@
                         if sim_fitter is None:
                             fitter = Fit(self._fit_engine)  
-                            self._fit_helper(fitproblem, pars, fitter, fit_id)
+                            self._fit_helper(fitproblem, pars, fitter,
+                                              fit_id, batch_result)
                             fitter_list.append(fitter) 
                         else:
                             fitter = sim_fitter
-                            self._fit_helper(fitproblem, pars, fitter, fit_id)
+                            self._fit_helper(fitproblem, pars, fitter,
+                                              fit_id, batch_result)
                         fit_id += 1
                     list_page_id.append(page_id)
@@ -731 +734 @@
                                     fn=fitter_list,
                                     pars=pars,
+                                    batch_result=batch_result,
                                     page_id=list_page_id,
                                     completefn=self._single_fit_completed,
@@ -739 +743 @@
             calc_fit = FitThread(handler=handler,
                                     fn=fitter_list,
+                                    batch_result=batch_result, 
                                     page_id=list_page_id,
                                     updatefn=handler.update_fit,
@@ -897 +902 @@
                 self.page_finder[uid].schedule_tofit(value)
                 
-    def _fit_helper(self, fitproblem, pars, fitter, fit_id):
+    def _fit_helper(self, fitproblem, pars, fitter, fit_id, batch_result):
         """
         Create and set fit engine with series of data and model
@@ -917 +922 @@
                     listOfConstraint.append((item[0],item[1]))
         fitter.set_model(model, fit_id, pars, constraints=listOfConstraint)
+        if "Data" not in batch_result.keys():
+            batch_result["Data"] = []
+        batch_result["Data"].append(data.name)
         fitter.set_data(data=data, id=fit_id, smearer=smearer, qmin=qmin, 
                         qmax=qmax)
@@ -947 +955 @@
         
     def _batch_single_fit_complete_helper(self, result, pars, page_id, 
-                                          elapsed=None):
+                                         batch_result,  elapsed=None):
         """
         Display fit result in batch 
@@ -986 +994 @@
                 cpage._on_fit_complete()
             
-    def _single_fit_completed(self, result, pars, page_id, elapsed=None):
+    def _single_fit_completed(self, result, pars, page_id, 
+                              batch_result, elapsed=None):
         """
          Display fit result on one page of the notebook.
@@ -999 +1008 @@
         if self.batch_on:
             wx.CallAfter(self._batch_single_fit_complete_helper,
-                          result, pars, page_id, elapsed=None)
+                          result, pars, page_id, batch_result, elapsed)
             return 
         else:  
@@ -1049 +1058 @@
                 raise
                
-    def _simul_fit_completed(self, result, page_id, pars=None, elapsed=None):
+    def _simul_fit_completed(self, result, page_id, batch_result, pars=None, 
+                             elapsed=None):
         """
         Display result of the fit on related panel(s).