Changeset a3c8e8f in sasview for fittingview/src

Timestamp:

Oct 5, 2011 5:15:40 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

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:

90ddcdb

Parents:

425e49ca

Message:

fixing batch plot problems

Location:

fittingview/src/sans/perspectives/fitting

Files:

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

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

@@ -500 +500 @@
         # fit weight
         self.weight = None
+        self.result = None
         
         
@@ -600 +601 @@
                                                            self.model)
         self.smearer_computed = True
+        self.result = None
         
     def get_fit_data(self):

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

@@ -1061 +1061 @@
             for res in result:
                 model, data = res.inputs[0]
-                temp_model = model.clone()
+                temp_model = model#.clone()
                 if res is None:
                     null_value = numpy.nan
@@ -1095 +1095 @@
                 self.page_finder[pid][data.id].set_result(res)
                 fitproblem = self.page_finder[pid][data.id]
-
+                
+               
                 from sans.models.qsmearing import smear_selection
                 #smearer = fitproblem.get_smearer()
@@ -1460 +1461 @@
             caption = current_pg.window_caption
             self.page_finder[page_id].set_fit_tab_caption(caption=caption)
-            
+            try:
+                # replace model cal to fit calculation if possible
+                new_plot.y = self.page_finder[page_id].get_result(fid=data.id).theory
+            except:
+                pass
+
             self.page_finder[page_id].set_theory_data(data=new_plot, 
                                                       fid=data.id)