Changeset 22ce7e2 in sasview for fittingview/src/sans

Timestamp:

Sep 23, 2011 10:40:23 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:

5e48acb

Parents:

d97dd6f

Message:

make sure each panel know the batch state

Location:

fittingview/src/sans/perspectives/fitting

Files:

• fitpanel.py (modified) (1 diff)
• fitting.py (modified) (3 diffs)

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

@@ -333 +333 @@
             caption = "FitPage" + str(self.fit_page_index)
             panel.set_index_model(self.fit_page_index)
+        panel.batch_on = self.batch_on
         panel.populate_box(dict=self.model_list_box)
         panel.set_manager(self._manager)

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

@@ -1049 +1049 @@
         """  
         self._mac_sleep(0.2)
-        if page_id[0] in self.fit_thread_list.keys():
-            del self.fit_thread_list[page_id[0]] 
-        if self.batch_on:
+        uid = page_id[0]
+        if uid in self.fit_thread_list.keys():
+            del self.fit_thread_list[uid] 
+          
+        cpage = self.fit_panel.get_page_by_id(uid)
+        if cpage.batch_on:
             wx.CallAfter(self._batch_single_fit_complete_helper,
                           result, pars, page_id, batch_outputs, 
@@ -1580 +1583 @@
             theory_data = self.page_finder[page_id].get_theory_data(fid=data_copy.id)
             gn = theory_data.data#[index]
-            if self.weight == None:
-                en = data_copy.err_data
-            else:
-                en = self.weight#data_copy.err_data#[index]
+            en = self.weight#data_copy.err_data#[index]
             residuals.data = (fn - gn) / en 
             residuals.qx_data = data_copy.qx_data#[index]
@@ -1606 +1606 @@
                 ## Set consitently w/AbstractFitengine: 
                 ## But this should be corrected later.
-                if self.weight == None:
-                    dy = data_copy.dy
-                else:
-                    dy = self.weight#deepcopy(data_copy.dy)
+                dy = self.weight#deepcopy(data_copy.dy)
                 dy[dy==0] = 1  
             fn = data_copy.y[index]